Deleted player cause I can
Merge branch 'master' of https://github.com/WinMac32/SpaceQuest

Conflicts:
	SpaceQuest/src/ca/viaware/rpg/entity/Bullet.java