Added conflict message to Readme
Removed ssh and gitconfig information
Added git reset
Merge branch '2013-01-chicago' of https://github.com/thehackerwithin/boot-camps into 2013-01-chicago