Referring to some additions I saw in the code from other contributors:
Adjusted the player moved method, it will still cause the player to lose
health when it comes into contact with a robot, i deleted the thread
code though. I tested with and without the new thread code and there did
seem to me some marked difference in speed. One of the problems I think
is that a new thread seems to be created every time the player is close
to an enemy. Since it is also inside playerMoved, it could be called
many times within a short time span, causing the creation of many many
threads which all run Thread.sleep which could hinder speed in the game.
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png