[Commotion-admin] [commotion-docs] Merges recent changes into master branch (#172)

[critzo]

You can merge this Pull Request by running:

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

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

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

-- Commit Summary --

  * added box o routers blog post for staging preview.
  * update to recent blog post
  * added teaser tag on recent blog post
  * corrected misspelling of Ubiquiti
  * updated conjuntion in first PP per reviewer comment.
  * updated conjuntion in first PP per reviewer comment.
  * updated box of routers blog post with feedback from team

-- File Changes --

    A commotionwireless.net/_posts/2014-05-13-little-box-of-routers.md (39)
    A commotionwireless.net/files/posts/051314-box-o-routers.jpg (0)
    A commotionwireless.net/files/posts/051314-confirmed-working.png (0)
    A commotionwireless.net/files/posts/051314-likely-compatible-with-exception.png (0)
    A commotionwireless.net/files/posts/051314-likely-compatible.png (0)
    A commotionwireless.net/files/posts/051314-likely-not-compatible.png (0)

-- Patch Links --

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

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