Merge pull request #15 from kalikaneko/master

fix typo

html/index.html

@@ -110,8 +110,8 @@
       <div>
         <h2 id="what-is-squatconf-">Why / What is SquatConf?</h2>
         <p>
-          Squatconf if a tech conference that will hapend ... in a squat, hence the name.
+          Squatconf if a tech conference that will happen... in a squat, hence the name.
-          it won't be a conference about squat or squatters, but will also talk about technologies that can be used in squats. <br>
+          it won't be a conference about squatting or squatters, but will also talk about technologies that can be used in squats. <br>
           On top of that, the name sounded nice, isn't it ?
         </p>
         <p>It started because some of us are lucky enough to attend marvelous conventions, made with love by amazing people. Great events with top-notch speakers, incredible venues, and amazing parties.</p>