Merge pull request #111 from Codercamp/josh/change-organizer

Update the organizer to include Josh Gaber

conduct.html

@@ -20,16 +20,16 @@ <h1><i class="fa fa-users"></i> Code of Conduct</h1>
     <ul>
       <li>We want to be inclusive; do not engage in homophobic, racist, transphobic, ableist, sexist, or otherwise exclusionary behavior.</li>
       <li>Don’t make exclusionary jokes. Don’t even make them "ironically".</li>
-      <li>Don’t harass people. Unconsented physical contact or sexual attention is harrassment. Dressing or acting in a certain way is not consent.</li>
-      <li>Aggression and elitism are unwelcome here — codercamp is not a competition.</li>
+      <li>Don’t harass people. Non-consensual physical contact or sexual attention is harassment. Dressing or acting in a certain way is not consent.</li>
+      <li>Aggression and elitism are unwelcome here — CoderCamp is not a competition.</li>
       <li>Although we meet in a pub, there is no expectation or pressure to drink alcohol. Don’t question anyone’s choice of drink.</li>
       <li>We’d rather you ask about gender than assume, and if you get it wrong, apologise, and use what they prefer.</li>
-      <li>Discussions of how to make codercamp more inclusive are welcomed.</li>
+      <li>Discussions of how to make CoderCamp more inclusive are welcomed.</li>
     </ul>
 
-    <p>If someone is breaking the rules, talk to Bryan or Rob in person or by email at <a href="mailto:[email protected]">[email protected]</a></p>
+    <p>If someone is breaking the rules, talk to Rob or Josh in person or by email at <a href="mailto:[email protected]">[email protected]</a></p>
 
-    <p>Read about <a href="http://theangryblackwoman.com/2009/10/01/the-dos-and-donts-of-being-a-good-ally/" >being a good ally</a> or some <a href="http://superopinionated.dreamhosters.com/101-a-tron/" >specific resources for various issues</a> if you’re worried about offending people.</p>
+    <p>Read about <a href="https://theangryblackwoman.com/2009/10/01/the-dos-and-donts-of-being-a-good-ally/" >being a good ally</a> or some <a href="http://superopinionated.dreamhosters.com/101-a-tron/" >specific resources for various issues</a> if you’re worried about offending people.</p>
 
     <p>Rules copied in part from <a href="http://computeranonymous.org">Computer Anonymous</a>
 

index.html

@@ -41,9 +41,10 @@ <h2><i class="fa fa-info-circle"></i> About CoderCamp Hamilton</h2>
                 tech community in the Greater Hamilton area.</p>
 
                 <p>CoderCamp Hamilton is organized by <a href="http://www.twitter.com/rprouse">Rob Prouse</a>
-                and <a href="http://www.twitter.com/bpoetz">Bryan Poetz</a> with the help of a small army of
+                and Josh Gaber, with the help of a small army of
                 <a href="http://harrypotter.wikia.com/wiki/House-elf">House-Elves</a> including
-                <a href="http://www.twitter.com/AJBovaird">AJ Bovaird</a>, but CoderCamp depends on the
+                <a href="http://www.twitter.com/AJBovaird">AJ Bovaird</a> and
+                <a href="http://www.twitter.com/bpoetz">Bryan Poetz</a>, but CoderCamp depends on the
                 tech community in Hamilton for support and talks. If you are working on something cool or
                 have something you would like to talk about, join our
                 <a href="https://codercampslackin.azurewebsites.net/">Slack channel</a> and tell us about it.</p>