Player
Merge branch 'development' of
https://github.com/Carbide/Collect-the-Poop.git into development

Conflicts:
	bin/com/carbidestudios/entity/Player.class
	src/com/carbidestudios/entity/Player.java