diff --git a/README.md b/README.md
index 92f2468..916e06e 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Maybe you have to install Jekyll if the last command doesn't work.
 ```
 gem install jekyll
 ```
+If that doesn't work, try `bundle install` then `bundle exec jekyll serve`.
 In your browser go to:
 http://localhost:4000/
 
diff --git a/coaches_training.deck.html b/coaches_training.deck.html
index 95ded57..17f6fd6 100644
--- a/coaches_training.deck.html
+++ b/coaches_training.deck.html
@@ -44,6 +44,27 @@ <h3>Discussion is key!</h3>
 
 <h3>Don't let the presenter(s) do all the talking!</h3>
 
+</section>
+    <section class="slide" id="code_of_conduct">
+<h2>Code of Conduct</h2>
+
+<p>The Berlin Code of Conduct (<a href="berlincodeofconduct.org">berlincodeofconduct.org</a>)  outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.</p>
+
+<h3>Expected Behavior</h3>
+
+<ul>
+<li>Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.</li>
+<li>Exercise consideration and respect in your speech and actions.
+-Attempt collaboration before conflict.</li>
+<li>Refrain from demeaning, discriminatory, or harassing behavior and speech.</li>
+<li>Be mindful of your surroundings and of your fellow participants.
+
+<ul>
+<li>Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.</li>
+</ul>
+</li>
+</ul>
+
 </section>
     <section class="slide" id="why_clojurebridge">
 <h2>Why ClojureBridge?</h2>
@@ -92,7 +113,7 @@ <h3>ClojureBridge</h3>
 <ul>
 <li>First workshop April 2014</li>
 <li>Since then over 40 workshops in the US, UK, Ireland, Australia, Scotland, Finland, Sweden, Brazil, Canada, and... Germany!</li>
-<li>In Berlin we’ve had lots: July 2015, January 2016, June 2016, November 2016 (what a year!), and now autumn 2017. 🎉</li>
+<li>Workshops in Berlin since July 2015 and recurring regularly! 🎉</li>
 </ul>
 
 </section>
@@ -112,11 +133,11 @@ <h2>How does a workshop work?</h2>
     <section class="slide" id="installfest">
 <h2>Installfest!</h2>
 
-<p>We use NightCode as editor. Of course if people have their own preference then that's fine.</p>
+<p>We use the NightCode editor. Of course if people have their own preference then that's fine.</p>
 
-<p>NightCode is pretty easy to install, it's just an executable JAR. We'll have a couple thumb drives to go around.</p>
+<p>NightCode is pretty easy to install, as it's just an executable JAR. We'll have a couple thumb drives to go around.</p>
 
-<p>Actually create and run a Quil project, so all dependencies are downloaded and available.</p>
+<p>Please actually create and run a Quil project, so all dependencies are downloaded and available.</p>
 
 <h4>Keep in mind:</h4>
 
@@ -287,6 +308,16 @@ <h4>Represent the diverse and welcoming community we stand for</h4>
 <li>Appreciate that different technologies have different trade-offs. Being easily accessible is one of them.</li>
 </ul>
 
+</section>
+    <section class="slide" id="code_of_conduct_violations">
+<h2>Code of Conduct Violations</h2>
+
+<p>The Berlin Code of Conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.</p>
+
+<h4>Q: How do I react if an attendee complains about CoC violation?</h4>
+
+<h4>A: Bring them to an orga-team memeber</h4>
+
 </section>
     <section class="slide" id="discussion_technical_capability">
 <h2>Discussion: Technical Capability</h2>
@@ -531,6 +562,7 @@ <h2>deck.rb presentation</h2>
           <li><a href="#clojurebridge_coaches_training">ClojureBridge Coaches Training</a></li>
           <li><a href="#todays_agenda">Today&#39;s Agenda</a></li>
           <li><a href="#what_is_this">What is this?</a></li>
+          <li><a href="#code_of_conduct">Code of Conduct</a></li>
           <li><a href="#why_clojurebridge">Why ClojureBridge?</a></li>
           <li><a href="#introductions">Introductions</a></li>
           <li><a href="#whats_a_clojurebridge">What&#39;s a ClojureBridge?</a></li>
@@ -546,6 +578,7 @@ <h2>deck.rb presentation</h2>
           <li><a href="#social_comfort_more_ideas">Social Comfort (More Ideas)</a></li>
           <li><a href="#social_comfort_pay_attention_to_pronouns">Social Comfort (pay attention to pronouns)</a></li>
           <li><a href="#social_comfort_even_more_ideas">Social Comfort (Even More Ideas)</a></li>
+          <li><a href="#code_of_conduct_violations">Code of Conduct Violations</a></li>
           <li><a href="#discussion_technical_capability">Discussion: Technical Capability</a></li>
           <li><a href="#technical_capability_ideas">Technical Capability (Ideas)</a></li>
           <li><a href="#technical_capability_more_ideas">Technical Capability (More Ideas)</a></li>
diff --git a/docs/coaches_training.deck.md b/docs/coaches_training.deck.md
index 61cfc56..2019559 100644
--- a/docs/coaches_training.deck.md
+++ b/docs/coaches_training.deck.md
@@ -17,6 +17,21 @@ It helps to have a whiteboard or those giant sticky notes for the discussions if
 ### Discussion is key!
 ### Don't let the presenter(s) do all the talking!
 
+
+# Code of Conduct
+
+The Berlin Code of Conduct ([berlincodeofconduct.org](berlincodeofconduct.org))  outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+### Expected Behavior
+
+ - Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+ - Exercise consideration and respect in your speech and actions.
+ -Attempt collaboration before conflict.
+ - Refrain from demeaning, discriminatory, or harassing behavior and speech.
+ - Be mindful of your surroundings and of your fellow participants.
+  - Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+
+
 # Why ClojureBridge?
 We're making tech more diverse and more welcoming!
 
@@ -180,6 +195,14 @@ DISCUSS!
 * Be genuinely interested in people's experiences. ("You built something? That's cool. What does it do?")
 * Appreciate that different technologies have different trade-offs. Being easily accessible is one of them.
 
+# Code of Conduct Violations
+
+The Berlin Code of Conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+#### Q: How do I react if an attendee complains about CoC violation?
+#### A: Bring them to an orga-team memeber
+
+
 # Discussion: Technical Capability
 ### How can you help people feel technically capable?
 ### What kinds of insecurities might your student have?