fixed reference error.
Fixed reference error.
Merge branch 'master' of https://github.com/edwardfxc/project4

Conflicts:
	Outpost/src/outpost/fifthDeliverable/Player.java