slight new cancer
Merge branch 'master' of https://github.com/rmartell/NanoCommando

Conflicts:
	NanoCommando/Projectfiles/GamePlayLayer.m