Added conflict message to Readme
Merge pull request #6 from jdblischak/2013-01-chicago

My final update.
Fix paths in shell section
Fix one more s,Shell-1,shell,
katy is presenting
Removed ssh and gitconfig information
added some boldness.
Merge branch '2013-01-chicago' of github.com:thehackerwithin/boot-camps into 2013-01-chicago
Fix a couple minor typos
Merge branch '2013-01-chicago' of github.com:thehackerwithin/boot-camps into 2013-01-chicago
first, not fist.
updates to exercise markup
fixed markup, added exercise
Merge branch '2013-01-chicago' of https://github.com/thehackerwithin/boot-camps into 2013-01-chicago
Added git reset
Merge branch '2013-01-chicago' of https://github.com/thehackerwithin/boot-camps into 2013-01-chicago
Added back basic gitconfig information
Merge branch '2013-01-chicago' of https://github.com/thehackerwithin/boot-camps into 2013-01-chicago
Changed back the Readme.md
Added a dummy file