From: W. Trevor King <wking@tremily.us>
Date: Thu, 31 Oct 2013 15:46:21 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=refs%2Fheads%2Fnamespaced;p=swc-modular-shell-hearing.git

Merge branch 'master' into namespaced

I added modular/shell/exercises/hearing/ namespacing and squashed that
into the merge.

* master: (90 commits)
  Changing 'git clone' URL in shell README to the read-only git:// URL.
  Fix shell header
  Added some words about the history command and bang-history # direct access.
  Fix old typo on file size.
  Clean up ambiguity between file and filename.
  There is no executable in the boot-camps directory - need to cd to shell dir first.
  remove some spaces getting in the way of bold
  Seem to have the tables figured out - they need a header - annoying
  Can we get some documentation on tables
  A few more changes to be consistent and clear.
  Some formatting and flow changes:
  Update shell/Readme.md
  Update shell/Readme.md
  Update shell/Readme.md
  shell/Readme.md: Fix 'swsc' -> 'swc' typo
  shell/Readme.md: Use USERNAME and YYYY-MM-PLACE in git clone instructions
  fixed links
  shell/Readme.md: use explicit URL (with https://)
  Conversion of all rst to corresponding markdown files
  removed references to 2013-01-chicago (those became YYYY-MM-PLACE) and thehackerwithin (those became USERNAME).
  ...
---

25a3f547fb35dc6e2e7fa984f73f71cba57f0eff
diff --cc modular/shell/exercises/hearing/README.md
index 0000000,61d5fda..61d5fda
mode 000000,100644..100644
--- a/modular/shell/exercises/hearing/README.md
+++ b/modular/shell/exercises/hearing/README.md