commit before merge
conflict resolution
conflict resolution

Conflicts:
	GameModel.m
	GameViewController.m