Misc
This commit is contained in:
		
							
								
								
									
										84
									
								
								index.html
									
									
									
									
									
								
							
							
						
						
									
										84
									
								
								index.html
									
									
									
									
									
								
							@ -248,7 +248,20 @@
 | 
				
			|||||||
    </div> <!-- End Education -->
 | 
					    </div> <!-- End Education -->
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<<<<<<< HEAD
 | 
					    <!-- Work
 | 
				
			||||||
 | 
					    =============================================== -->
 | 
				
			||||||
 | 
					    <div class="row work">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <div class="three columns header-col">
 | 
				
			||||||
 | 
					        <h1><span>Experience</span></h1>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <div class="nine columns main-col">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        <div class="row item">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          <div class="twelve columns">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <h3>University of Paris-Seine</h3>
 | 
					            <h3>University of Paris-Seine</h3>
 | 
				
			||||||
            <p class="info">
 | 
					            <p class="info">
 | 
				
			||||||
              Research & Teaching Assistant<span>•</span>
 | 
					              Research & Teaching Assistant<span>•</span>
 | 
				
			||||||
@ -262,43 +275,24 @@
 | 
				
			|||||||
                <li>- Data Integration & Warehouses</li>
 | 
					                <li>- Data Integration & Warehouses</li>
 | 
				
			||||||
              </ul>
 | 
					              </ul>
 | 
				
			||||||
            </p>
 | 
					            </p>
 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
      <!-- Work
 | 
					 | 
				
			||||||
      =============================================== -->
 | 
					 | 
				
			||||||
      <div class="row work">
 | 
					 | 
				
			||||||
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <div class="three columns header-col">
 | 
					 | 
				
			||||||
          <h1><span>Experience</span></h1>
 | 
					 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <div class="nine columns main-col">
 | 
					        </div> <!-- item end -->
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <div class="row item">
 | 
					        <div class="row item">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          <div class="twelve columns">
 | 
					          <div class="twelve columns">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
            <h3>LET'S GO travel net</h3>
 | 
					            <h3>LET'S GO travel net</h3>
 | 
				
			||||||
            <p class="info">
 | 
					            <p class="info">
 | 
				
			||||||
              IT Consultant<span>•</span>
 | 
					              IT Consultant<span>•</span>
 | 
				
			||||||
              <em class="date">Oct 2015 - Sep 2016</em>
 | 
					              <em class="date">Oct 2015 - Sep 2016</em>
 | 
				
			||||||
            </p>
 | 
					            </p>
 | 
				
			||||||
=======
 | 
					
 | 
				
			||||||
              <h3>University of Paris-Seine</h3>
 | 
					 | 
				
			||||||
              <p class="info">
 | 
					 | 
				
			||||||
                Research & Teaching Assistant<span>•</span>
 | 
					 | 
				
			||||||
                <em class="date">Oct. 2016 - Present</em>
 | 
					 | 
				
			||||||
              </p>
 | 
					 | 
				
			||||||
            <p style="text-align: justify;">
 | 
					            <p style="text-align: justify;">
 | 
				
			||||||
                <ul>
 | 
					              Design "Live Like Local", a collaborative cross-platform framework that facilitates the communication of citizens with local authorities. Let visitors discover how the locals live and allow businesses to offer unique experiences and maximize their profits.
 | 
				
			||||||
                  <li>Developing Applications for Mobile Devices</li>
 | 
					 | 
				
			||||||
                  <li>Advanced Databases</li>
 | 
					 | 
				
			||||||
                  <li>Web Services & Service Oriented Architectures</li>
 | 
					 | 
				
			||||||
                  <li>Data Integration & Warehouses</li>
 | 
					 | 
				
			||||||
                </ul>
 | 
					 | 
				
			||||||
            </p>
 | 
					            </p>
 | 
				
			||||||
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -308,23 +302,15 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
          <div class="twelve columns">
 | 
					          <div class="twelve columns">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              <h3>LET'S GO travel net</h3>
 | 
					 | 
				
			||||||
              <p class="info">
 | 
					 | 
				
			||||||
                IT Consultant<span>•</span>
 | 
					 | 
				
			||||||
                <em class="date">Oct. 2015 - Sep. 2016</em>
 | 
					 | 
				
			||||||
              </p>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
            <h3>CERN</h3>
 | 
					            <h3>CERN</h3>
 | 
				
			||||||
            <p class="info">
 | 
					            <p class="info">
 | 
				
			||||||
              Intern<span>•</span>
 | 
					              Intern<span>•</span>
 | 
				
			||||||
              <em class="date">Jul - Sep 2015</em>
 | 
					              <em class="date">Jul - Sep 2015</em>
 | 
				
			||||||
            </p>
 | 
					            </p>
 | 
				
			||||||
=======
 | 
					
 | 
				
			||||||
            <p style="text-align: justify;">
 | 
					            <p style="text-align: justify;">
 | 
				
			||||||
                Design "Live Like Local", a collaborative cross-platform framework that facilitates the communication of citizens with local authorities. Let visitors discover how the locals live and allow businesses to offer unique experiences and maximize their profits.
 | 
					              Assert with Google Test and further develop CernVM WebAPI, an infrastructure in C++ that enables launching computational jobs on volunteer, cluster and cloud nodes. Support with this technology "Virtual Atom Smasher", a CERN interactive educational game in JavaScript, and upgrade its UI.
 | 
				
			||||||
            </p>
 | 
					            </p>
 | 
				
			||||||
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -334,13 +320,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
          <div class="twelve columns">
 | 
					          <div class="twelve columns">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              <h3>CERN</h3>
 | 
					 | 
				
			||||||
              <p class="info">
 | 
					 | 
				
			||||||
                Intern<span>•</span>
 | 
					 | 
				
			||||||
                <em class="date">Jul. - Sep. 2015</em>
 | 
					 | 
				
			||||||
              </p>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
            <h3>University of Thessaly</h3>
 | 
					            <h3>University of Thessaly</h3>
 | 
				
			||||||
            <p class="info">
 | 
					            <p class="info">
 | 
				
			||||||
              Graduate Assistant<span>•</span>
 | 
					              Graduate Assistant<span>•</span>
 | 
				
			||||||
@ -352,31 +331,6 @@
 | 
				
			|||||||
                <li>- System Programming</li>
 | 
					                <li>- System Programming</li>
 | 
				
			||||||
              </ul>
 | 
					              </ul>
 | 
				
			||||||
            </p>
 | 
					            </p>
 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
              <p style="text-align: justify;">
 | 
					 | 
				
			||||||
                Assert with Google Test and further develop CernVM WebAPI, an infrastructure in C++ that enables launching computational jobs on volunteer, cluster and cloud nodes. Support with this technology "Virtual Atom Smasher", a CERN interactive educational game in JavaScript, and upgrade its UI.
 | 
					 | 
				
			||||||
              </p>
 | 
					 | 
				
			||||||
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            </div>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
          </div> <!-- item end -->
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
          <div class="row item">
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            <div class="twelve columns">
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
              <h3>University of Thessaly</h3>
 | 
					 | 
				
			||||||
              <p class="info">
 | 
					 | 
				
			||||||
                Graduate Assistant<span>•</span>
 | 
					 | 
				
			||||||
                <em class="date">Sep. 2014 - May 2015</em>
 | 
					 | 
				
			||||||
              </p>
 | 
					 | 
				
			||||||
              <p style="text-align: justify;">
 | 
					 | 
				
			||||||
                <ul>
 | 
					 | 
				
			||||||
                  <li>Concurrent Programming</li>
 | 
					 | 
				
			||||||
                  <li>System Programming</li>
 | 
					 | 
				
			||||||
                </ul>
 | 
					 | 
				
			||||||
              </p>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user