small update to readme
Update README.md
Update README.md
added .gitignore file
Merge branch 'master' of https://github.com/opentechinstitute/commotion-docs
updated jeykyll serve instructions in readme
resolved conflict in .gitignore
Merge changes from staging site, for live site update.
Merge pull request #123 from opentechinstitute/staging

pre-1.1 release update
Merge pull request #126 from opentechinstitute/staging

Merges recent changes into master branch
Merge pull request #149 from opentechinstitute/staging

Merges recent changes into master branch
Merge pull request #165 from opentechinstitute/staging

Merging recent changes from staging to master.
Merge pull request #167 from opentechinstitute/staging

Merges recent changes into master branch
Merge pull request #172 from opentechinstitute/staging

Merges recent changes into master branch
link fix for tp link downloads
revised and updated commotion computer downloads page
direct fixes for #178 #177
updated text and link on Commotion Android download page.
updated pages containing two nodes back to back per issue #176
added text recommended by a user for Rooftop Basics, per #171