sd
Merge branch 'master' of https://github.com/lidise7en/CookieCrush

Conflicts:
	CookieCrush/CookieCrush.xcodeproj/project.xcworkspace/xcuserdata/dennisl.xcuserdatad/UserInterfaceState.xcuserstate
logic part finish