stuffff
Merge remote-tracking branch 'origin/ESE-Branch' into ESE-Branch

Conflicts:
	ProjectTheseus/src/edu/virginia/cs/sgd/libgdx/entities/Creature.java