Merge pull request #2 from ryankinal/gh-pages

Spelling and Grammar Changes

Author: ralt

index.html

@@ -105,13 +105,13 @@ <h1>Etiquette</h1>
 	</div>
 	<div class="row">
 		<p>
-			This is a very simple guideline for everyone to follow. We are all adults and come from different walks of life, we will not always see eye to eye on political or religious topics... However this is also the internet and these topics do come up from time to time. Please be respectful when discussing them and be prepared to cease discussion if someone asks you too. I am not for censorship but there is a proper forum for this type of discussion and in the case of someone being offended by it that forum should then be used in lieu of this one.
+			This is a very simple guideline for everyone to follow. We are all adults and come from different walks of life, we will not always see eye to eye on political or religious topics... However this is also the internet and these topics do come up from time to time. Please be respectful when discussing them and be prepared to cease discussion if someone asks you to. I am not for censorship but there is a proper forum for this type of discussion and in the case of someone being offended by it that forum should then be used in lieu of this one.
 		</p>
 		<p>
 			Some people see languages as religions, this cannot be avoided. We all hate Java but we shouldn't lynch the people who write it. CoffeeScript might not be your cup of joe, so if someone is soliciting help in it, just ignore the conversation. Please use common sense while chatting in the room. We don't want to flag people but we will.
 		</p>
 		<p>
-			Swearing is tolorated so long as 1) you are not using it to insult another user. 2) you are not throwing around curse words like a 10 year old at summer camp. We understand emphesis and frustration can result in a fuck or two, but just try not to get out of hand.
+			Swearing is tolorated so long as 1) you are not using it to insult another user. 2) you are not throwing around curse words like a 10 year old at summer camp. We understand emphasis and frustration can result in a fuck or two, but just try not to get out of hand.
 		</p>
 		<p>
 			Animated gifs are fun, and often entertaining and we all (mostly) enjoy them... at first. There is a timeout on editing posts, please take note of how long said timeout is and "un-onebox" the gif before it is too late. People like to enjoy the gif once, maybe twice, but over and over until the conversation pushes it off screen is annoying.
@@ -282,7 +282,7 @@ <h1>Useful Links</h1>
 		<div class="thumbnail">
 			<a class="link-title" href="http://api.jquery.com/" target="_blank">jQuery API Docs</a>
 			<p>
-				Too often is this the solution to your problem, RTFD. Don't expect people to google for you.
+				Too often is this the solution to your problem. RTFD. Don't expect people to google for you.
 			</p>
 		</div>
 		</li>