diff --git a/index.html b/index.html
index e69de29..cd71297 100755
--- a/index.html
+++ b/index.html
@@ -0,0 +1,457 @@
+<<<<<<< HEAD
+=======
+<!DOCTYPE html>
+<!--[if lt IE 8 ]><html class="no-js ie ie7" lang="en"> <![endif]-->
+<!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]-->
+<!--[if (gte IE 8)|!(IE)]><!-->
+<html class="no-js" lang="en"> <!--<![endif]-->
+<head>
+
+  <!--
+  Theme: Ceevee
+  Forked from Styleshout
+  http://www.styleshout.com/free-templates/ceevee
+  ================================================== -->
+
+  <!--- Basic Page Needs
+  ================================================== -->
+  <meta charset="utf-8">
+
+  <title>Manos Katsomallos</title>
+
+  <meta name="title" content="Manos Katsomallos" />
+  <meta name="description" content="Computer scientist, software engineer, son of his father and not his brother.">
+  <meta name="keywords" content="manos katsomallos, emmanouil katsomallos, katsomallos">
+
+  <meta name="google-site-verification" content="1fcZUhocM3VHQVkr-BwBh2vLBw-eCKRLExWPE4t21ac" />
+
+  <meta property="og:url" content="http://delkappa.com" />
+  <meta property="og:title" content="Manos Katsomallos" />
+  <meta property="og:description" content="Computer scientist, software engineer, son of his father and not his brother." />
+  <meta property="og:image" content="http://delkappa.com/images/profilepic-og.jpg" />
+
+  <!-- Mobile Specific Metas
+  ================================================== -->
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+
+  <!-- CSS
+  ================================================== -->
+  <link rel="stylesheet" href="css/default.css">
+  <link rel="stylesheet" href="css/layout.css">
+  <link rel="stylesheet" href="css/media-queries.css">
+  <link rel="stylesheet" href="css/magnific-popup.css">
+  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+
+  <!-- Scripts
+  ================================================== -->
+  <script src="js/modernizr.js"></script>
+  <!-- CAPTCHA -->
+  <script src='https://www.google.com/recaptcha/api.js'></script>
+  <!-- Google Analytics -->
+  <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-73540705-1', 'auto');
+  ga('require', 'linkid');
+  ga('send', 'pageview');
+  ga('set', 'userId', '116359764');
+  </script>
+  <!-- End Google Analytics -->
+
+  <!-- Favicons
+  ================================================== -->
+  <link rel="shortcut icon" href="images/favicon.ico" >
+
+</head>
+
+<body>
+  <!-- Header
+  Photo: Play Among The Stars
+  By David L. Labrie — National Geographic Your Shot
+  http://yourshot.nationalgeographic.com/photos/6755620
+  ================================================== -->
+  <header id="home">
+
+    <nav id="nav-wrap">
+
+      <a class="mobile-btn" href="#nav-wrap" title="Show navigation">Show navigation</a>
+      <a class="mobile-btn" href="#" title="Hide navigation">Hide navigation</a>
+
+      <ul id="nav" class="nav">
+        <li class="current"><a class="smoothscroll" href="#home">Home</a></li>
+        <li><a class="smoothscroll" href="#about">About</a></li>
+        <li><a class="smoothscroll" href="#resume">Resume</a></li>
+        <li><a class="smoothscroll" href="#contact">Contact</a></li>
+      </ul> <!-- end #nav -->
+
+    </nav> <!-- end #nav-wrap -->
+
+    <div class="row banner">
+      <div class="banner-text">
+        <h1 class="responsive-headline">manos katsomallos</h1>
+        <h3>Computer scientist, software engineer, <br>son of his father and not his brother.</h3>
+        <hr/>
+        <ul class="social">
+          <li><a href="mailto:manos@delkappa.com" title="email" target="_blank"><i class="fa fa-at"></i></a></li>
+          <li><a href="//fb.com/delkappa" title="facebook" target="_blank"><i class="fa fa-facebook"></i></a></li>
+          <li><a href="//github.com/delkappa" title="GitHub" target="_blank"><i class="fa fa-github"></i></a></li>
+          <li><a href="//instagram.com/delkappa" title="Instagram" target="_blank"><i class="fa fa-instagram"></i></a></li>
+          <li><a href="//linkedin.com/in/delkappa" title="LinkedIn" target="_blank"><i class="fa fa-linkedin"></i></a></li>
+          <li><a href="skype:emkatsom" title="Skype"><i class="fa fa-skype"></i></a></li>
+          <li><a href="//twitter.com/delkappa" title="Twitter" target="_blank"><i class="fa fa-twitter"></i></a></li>
+        </ul>
+      </div>
+    </div>
+
+    <p class="scrolldown">
+      <a class="smoothscroll" href="#about"><i class="icon-down-circle"></i></a>
+    </p>
+
+  </header> <!-- Header End -->
+
+
+  <!-- About Section
+  ================================================== -->
+  <section id="about">
+
+    <div class="row">
+
+      <div class="three columns">
+
+        <img class="profile-pic" src="images/profilepic.jpg" alt="" />
+
+      </div>
+
+      <div class="nine columns main-col" >
+
+        <h2>About</h2>
+
+        <p style="text-align: justify">
+          Manos is a Research &amp; Teaching Assistant at the University of Paris-Seine in France, doing a PhD in Computer Science on "Quality &amp; Privacy in User-generated Big Data: Algorithms &amp; Techniques".
+        </p>
+
+        <p style="text-align: justify">
+          He holds an MSc in Science &amp; Technology of Electrical &amp; Computer Engineering and an Engineer's Degree (5-year programme) in Computer &amp; Communication Engineering from the University of Thessaly in Greece.
+        </p>
+
+        <p style="text-align: justify">
+          His broad research interests focus in (but are not limited to) the area of Ubiquitous Computing, Internet of Things and especially Crowdsensing and Data Management.
+        </p>
+
+        <div class="row">
+
+          <div class="columns contact-details">
+
+            <h2>Contact Details</h2>
+            <p class="address">
+              <span>Manos Katsomallos</span>
+              <br>
+              <span>2 Avenue Adolphe Chauvin</span>
+              <br>
+              <span>Bâtiment A</span>
+              <br>
+              <span>Bureau 564</span>
+              <br>
+              <span>95300 Pontoise</span>
+              <br>
+              <span>France</span>
+              <br>
+              <span>+33 1 34 25 66 55</span>
+              <br>
+              <span>manos@delkappa.com</span>
+            </p>
+
+          </div>
+
+          <div class="columns download">
+            <p>
+              <a href="//goo.gl/C6W4Q6" class="button"><i class="fa fa-download"></i>Download Resume</a>
+            </p>
+          </div>
+
+        </div> <!-- end row -->
+
+      </div> <!-- end .main-col -->
+
+    </div>
+
+  </section> <!-- About Section End-->
+
+
+  <!-- Resume Section
+  ================================================== -->
+  <section id="resume">
+
+    <!-- Education
+    =============================================== -->
+    <div class="row education">
+
+      <div class="three columns header-col">
+        <h1><span>Education</span></h1>
+      </div>
+
+      <div class="nine columns main-col">
+
+        <div class="row item">
+
+          <div class="twelve columns">
+
+            <h3>University of Paris-Seine</h3>
+            <p class="info">
+              Doctor of Philosophy (PhD), Computer Science<span>&bull;</span><em class="date">Ongoing</em>
+            </p>
+            <h6>Quality &amp; Privacy in User-generated Big Data: Algorithms &amp; Techniques</h6>
+            <p style="text-align: justify;">
+              Explore integration issues for spatio-temporal data coming from crowdsourcing platforms and understand the impact to the privacy of personal information. Study matters relating to the effect of size of data to the quality and the impact of improved quality on users' privacy.
+            </p>
+
+          </div>
+
+        </div> <!-- item end -->
+
+        <div class="row item">
+
+          <div class="twelve columns">
+
+            <h3>University of Thessaly</h3>
+            <p class="info">
+              Master of Science (MSc), Science &amp; Technology of Electrical &amp; Computer Engineering<span>&bull;</span><em class="date">2015</em>
+            </p>
+            <h6>Mechanisms for the Dynamic Installation &amp; Control of Data Collection Tasks on Smartphones</h6>
+            <p style="text-align: justify;">
+              Extend "EasyHarvest" to support the flexible development, installation and activation of dynamic standalone and collaborative privacy mechanisms using Wi-Fi Direct on mobile personal devices, as independently developed software components that can be used in conjunction with sensing applications that run on the device. <a href="//goo.gl/ws73Pp" target="_blank">[Read More]</a>
+            </p>
+
+          </div>
+
+        </div> <!-- item end -->
+
+        <div class="row item">
+
+          <div class="twelve columns">
+
+            <h3>University of Thessaly</h3>
+            <p class="info">
+              Engineer's Degree (5-year programme), Computer &amp; Communication Engineering<span>&bull;</span><em class="date">2014</em>
+            </p>
+            <h6>Deployment &amp; Controlled Execution of Sensing Tasks on Smartphones</h6>
+            <p style="text-align: justify;">
+              Build "EasyHarvest", a crowdsourcing framework that simplifies the deployment and controlled execution of large-scale sensing applications on Android smartphones via a single web interface. Introduce a RESTful API in Java on top of Tomcat for client-server communication and data collection organized in SQL and XML structures. <a href="//goo.gl/x5S9r9" target="_blank">[Read More]</a>
+            </p>
+
+          </div>
+
+        </div> <!-- item end -->
+
+      </div> <!-- main-col end -->
+
+    </div> <!-- End Education -->
+
+
+    <!-- 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>
+            <p class="info">
+              Research &amp; Teaching Assistant<span>&bull;</span>
+              <em class="date">Oct. 2016 - Present</em>
+            </p>
+            <p style="text-align: justify;">
+              <ul>
+                <li>Developing Applications for Mobile Devices</li>
+                <li>Advanced Databases</li>
+                <li>Web Services &amp; Service Oriented Architectures</li>
+                <li>Data Integration &amp; Warehouses</li>
+              </ul>
+            </p>
+
+          </div>
+
+        </div> <!-- item end -->
+
+        <div class="row item">
+
+          <div class="twelve columns">
+
+            <h3>LET'S GO travel net</h3>
+            <p class="info">
+              IT Consultant<span>&bull;</span>
+              <em class="date">Oct. 2015 - Sep. 2016</em>
+            </p>
+
+            <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.
+            </p>
+
+          </div>
+
+        </div> <!-- item end -->
+
+        <div class="row item">
+
+          <div class="twelve columns">
+
+            <h3>CERN</h3>
+            <p class="info">
+              Intern<span>&bull;</span>
+              <em class="date">Jul. - Sep. 2015</em>
+            </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>
+
+          </div>
+
+        </div> <!-- item end -->
+
+        <div class="row item">
+
+          <div class="twelve columns">
+
+            <h3>University of Thessaly</h3>
+            <p class="info">
+              Graduate Assistant<span>&bull;</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> <!-- item end -->
+
+      </div> <!-- main-col end -->
+
+    </div> <!-- End Work -->
+
+
+    <!-- Skills
+    =============================================== -->
+    <div class="row skill">
+
+      <div class="three columns header-col">
+        <h1><span>Skills</span></h1>
+      </div>
+
+      <div class="nine columns main-col">
+        <div class="bars">
+
+          <ul class="skills">
+            <li><span class="bar-expand iot"></span><em>Internet of Things</em></li>
+            <li><span class="bar-expand languages"></span><em>Software Engineering</em></li>
+            <li><span class="bar-expand systems"></span><em>Operating Systems</em></li>
+            <li><span class="bar-expand ubicom"></span><em>Ubiquitous Computing</em></li>
+          </ul>
+
+        </div><!-- end skill-bars -->
+
+      </div> <!-- main-col end -->
+
+    </div> <!-- End skills -->
+
+  </section> <!-- Resume Section End-->
+
+
+  <!-- Contact Section
+  ================================================== -->
+  <section id="contact">
+
+    <div class="row section-head">
+
+      <div class="twelve columns header-col">
+        <h1><br>Want to send me a &hearts; letter?</h1>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="twelve columns">
+
+        <!-- form -->
+        <form action="" method="post" id="contactForm" name="contactForm">
+          <fieldset>
+            <input type="text" value="" size="35" maxlength="100" id="contactName" name="contactName" placeholder="Name (required)">
+            <input type="text" value="" size="35" maxlength="100" id="contactEmail" name="contactEmail" placeholder="Email (required)">
+            <input type="text" value="" size="35" maxlength="100" id="contactSubject" name="contactSubject" placeholder="Subject">
+            <textarea cols="50" rows="15" maxlength="1500" id="contactMessage" name="contactMessage" placeholder="Message" style="resize: vertical; font-family: inherit; font-size: inherit"></textarea>
+            <button
+                class="g-recaptcha submit"
+                data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
+              Submit
+            </button>
+            <span id="image-loader">
+              <img alt="" src="images/loader.gif">
+            </span>
+          </fieldset>
+        </form> <!-- Form End -->
+
+        <!-- contact-warning -->
+        <div id="message-warning"> Error boy</div>
+        <!-- contact-success -->
+        <div id="message-success">
+          <i class="fa fa-check"></i>Your message was sent, thank you!<br>
+        </div>
+
+      </div>
+
+    </div>
+
+  </section> <!-- Contact Section End-->
+
+
+  <!-- footer
+  ================================================== -->
+  <footer>
+    <div class="row">
+      <div class="twelve columns">
+        <ul class="social-links">
+          <li><a href="mailto:manos@delkappa.com" title="email" target="_blank"><i class="fa fa-at"></i></a></li>
+          <li><a href="//fb.com/delkappa" title="facebook" target="_blank"><i class="fa fa-facebook"></i></a></li>
+          <li><a href="//github.com/delkappa" title="GitHub" target="_blank"><i class="fa fa-github"></i></a></li>
+          <li><a href="//instagram.com/delkappa" title="Instagram" target="_blank"><i class="fa fa-instagram"></i></a></li>
+          <li><a href="//linkedin.com/in/delkappa" title="LinkedIn" target="_blank"><i class="fa fa-linkedin"></i></a></li>
+          <li><a href="skype:emkatsom" title="Skype"><i class="fa fa-skype"></i></a></li>
+          <li><a href="//twitter.com/delkappa" title="Twitter" target="_blank"><i class="fa fa-twitter"></i></a></li>
+        </ul>
+        <ul class="copyright">
+          <li>&copy; <script type="text/javascript">document.write(new Date().getFullYear());</script> Manos Katsomallos</li>
+        </ul>
+      </div>
+      <div id="go-top"><a class="smoothscroll" title="Back to Top" href="#home"><i class="icon-up-open"></i></a></div>
+    </div>
+  </footer> <!-- Footer End-->
+
+  <!-- Java Script
+  ================================================== -->
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <script>window.jQuery || document.write('<script src="js/jquery-1.10.2.min.js"><\/script>')</script>
+  <script type="text/javascript" src="js/jquery-migrate-1.2.1.min.js"></script>
+  <script src="js/jquery.flexslider.js"></script>
+  <script src="js/waypoints.js"></script>
+  <script src="js/jquery.fittext.js"></script>
+  <script src="js/magnific-popup.js"></script>
+  <script src="js/init.js"></script>
+
+</body>
+
+</html>
+>>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891
