Speed should now be individual to each entity
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git

Conflicts:
	2dGame/src/entity/Entity.java

Attempt at fixing a conflict
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git