trying to put forward and back on the same line.
Merge branch '2013-01-chicago' of github.com:thehackerwithin/boot-camps into 2013-01-chicago
changed
adds a tiger file
Merge branch '2013-01-chicago' of https://github.com/thehackerwithin/boot-camps into 2013-01-chicago

Conflicts:
	tiger.txt