to be thrown away...
Merge branch 'master' of github.com:Hunter34/C1Challenge

Conflicts:
	CCTableViewController.m
	ChaiOneChallenge/Base.lproj/Main.storyboard
zdf
Played around with formatting, timing, rounded corners.