Test commit

Deleletd bad word in String
Scaled player

-Player has been downsized
Merge branch 'collisionGroups'

Conflicts:
	Prototypes/basicGame2/basicGame/MyScene.m
Merge branch 'master' into collisionGroups
Deleted extra physics game, added extra voice