pearlchen · tessalt · Sep 16, 2013 · Sep 21, 2013 · Feb 1, 2014 · Feb 1, 2014
diff --git a/Project/.DS_Store b/Project/.DS_Store
diff --git a/Project/final.html b/Project/final.html
@@ -1,12 +1,12 @@
-<!doctype html> 
+<!doctype html>
 <html>
 <head>
   <title>Ladies Learning Code HTML and CSS</title>
   <link href='http://fonts.googleapis.com/css?family=Oswald' rel='stylesheet' type='text/css'>
   <style>
     /* normalize.css 2011-06-23T00:50 UTC //github.com/jonathantneal/normalize.css */
     article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}html{cursor:default;font-size:100%;overflow-y:scroll;-webkit-tap-highlight-color:transparent;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body,form,input,button,select,textarea{font-size:100%;margin:0}a,a:active,a:hover{outline:none}a:focus{outline:thin dotted}abbr{_border-bottom:expression(this.title ? '1px dotted':'none')}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}mark{background:#FF0;color:#000}pre,code,kbd,samp{font-family:monospace,monospace;_font-family:'courier new',monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:before,q:after{content:'';content:none}small,sub,sup{font-size:75%}sub,sup{line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}nav ul{list-style:none}audio[controls],canvas,video{display:inline-block;*display:inline}audio{display:none;_display:expression(this.controls ? 'inline':'none');*zoom:1}audio[controls]{display:inline-block}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){ overflow:hidden}legend{*margin-left:-7px}button,input,select,textarea{vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal;_overflow:expression(this.type == 'button|reset|submit' ? 'visible':'')}button,input[type="button"],input[type="reset"],input[type="submit"]{overflow:visible;-webkit-appearance:button}input[type="checkbox"],input[type="radio"]{box-sizing:border-box}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration{ -webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
-    body {      
+    body {
       color: #444444;
       font-family: Helvetica, Arial, sans-serif;
     }
@@ -32,7 +32,6 @@
       width: 200px;
       height: 200px;
       padding: 5px;
-      margin-right: 10px;
       float: left;
       margin-right: 20px;
     }

diff --git a/Project/images/.DS_Store b/Project/images/.DS_Store
diff --git a/contributing.md b/contributing.md
@@ -0,0 +1,42 @@
+# Editing and Contributing to LLC-HTML-CSS
+
+**Note: this is now the canonical upstream repo for Ladies Learning Code Intro to HTML & CSS**
+
+## If you are an instructor and want to make workshop-specific changes before your event
+
+If you are a workshop instructor and would like to make specific modifications for *your* workshop (ex. adding housekeeping info, instructor bios, notices):
+
+1. Fork `https://github.com/ladieslearningcode/LLC-HTML-CSS.git` to your own Github account
+2. Make your changes and commit them to your fork
+3. In the future, if you would like to keep your fork up to date with master, add this repository as the upstream origin:
+
+        git remote add upstream https://github.com/ladieslearningcode/LLC-HTML-CSS.git
+
+4. Fetch changes from upstream:
+
+        git fetch upstream
+
+5. Merge upstream changes with master:
+
+        git checkout master && git merge upstream/master
+
+## If you would like to contribute to LLC-HTML-CSS
+
+To make changes to the slide deck that you want integrated back into the canonical repo:
+
+1. Fork `https://github.com/ladieslearningcode/LLC-HTML-CSS.git` to your own Github account
+2. Make your changes and commit them to your fork
+3. Push to your fork on Github
+4. File a pull request against /ladieslearningcode/LLC-HTML-CSS
+    - from your fork on Github, go to **Pull Requests**
+    - click 'New Pull Request'
+    - by default, it will want to file the pull request against Pearl's repo. Click the 'edit' button at the top of the page and select **ladieslearningcode/LLC-HTML-CSS** from the base fork dropdown
+    - click 'Create Pull Request'
+    - add a descriptive message
+    - click 'Make Pull Request'
+5. One of the project maintainers will review and merge your changes. Bug one of us on twitter if you don't hear back soon!
+6. In the future, if you would like to keep your fork up to date with master, add this repository as the upstream origin:
+
+        git remote add upstream https://github.com/ladieslearningcode/LLC-HTML-CSS.git
+
+  then pull and merge upstream into your master.