asdasdads
Merge branch 'New-Game-Layout-' of https://github.com/codeca/codecan into New-Game-Layout-

Conflicts:
	codecan/codecan/MyScene.m