Added test v2 convert
Converted notebooks to v2
Changed version number 3->2
Merge branch '2013-01-chicago' of github.com:thehackerwithin/boot-camps into 2013-01-chicago
Minor fixes, updated ipynb to obsolete version
Merge branch '2013-01-chicago' of https://github.com/thehackerwithin/boot-camps into 2013-01-chicago
Added conflict message to Readme