No changes
Icon and reset background
icon
Merge branch 'master' of github.com:mitchmainin/FiftyFifty

Conflicts:
	FiftyFifty.spritebuilder/FiftyFifty.ccbproj
	FiftyFifty.spritebuilder/SpriteBuilder Resources/obstacle.ccb