Added conflict message to Readme
Removed ssh and gitconfig information
trying to put forward and back on the same line.
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
Removed dummy
Added back welcome to Readme and changed link in remote/Readme
Merge branch '2013-01-chicago' of https://github.com/sriharikrishna/boot-camps into 2013-01-chicago
Minor reorganizatio of remote/Readme
Changed the undo modifications notes for git
Moved genos.txt from functions_and_modules to flow_control.
rm'd feedback link.
Added solutions to Python exercises for flow_control and functions_and_modules.
Merge branch '2013-01-chicago' of github.com:thehackerwithin/boot-camps into 2013-01-chicago
Merge branch '2013-01-chicago' of github.com:thehackerwithin/boot-camps into 2013-01-chicago
changed