[Commotion-admin] [commotion-docs] merging recent changes from master back to staging (#179)

[critzo]

You can merge this Pull Request by running:

  git pull https://github.com/opentechinstitute/commotion-docs master

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/commotion-docs/pull/179

-- Commit Summary --

  * 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
  * Merge pull request #126 from opentechinstitute/staging
  * Merge pull request #149 from opentechinstitute/staging
  * Merge pull request #165 from opentechinstitute/staging
  * Merge pull request #167 from opentechinstitute/staging
  * Merge pull request #172 from opentechinstitute/staging
  * 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

-- File Changes --

    M commotionwireless.net/docs/cck/building-mounting/learn-about-rooftop-mounts/index.md (8)
    M commotionwireless.net/docs/cck/building-mounting/learn-rooftop-basics/index.md (10)
    M commotionwireless.net/docs/cck/installing-configuring/common-configuration/index.md (35)
    M commotionwireless.net/docs/cck/planning/inventory-the-neighborhood/index.md (4)
    A commotionwireless.net/docs/index.md (22)
    M commotionwireless.net/download/android/index.md (23)
    M commotionwireless.net/download/computers/index.md (58)
    M commotionwireless.net/download/routers/index.md (4)

-- Patch Links --

https://github.com/opentechinstitute/commotion-docs/pull/179.patch
https://github.com/opentechinstitute/commotion-docs/pull/179.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-docs/pull/179
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20140606/900150f7/attachment.html>