simplified the entity by clamping within the number range
updated the entity tester
Merge branch 'master' of https://github.com/akmadsen/sisyphus1.git

Conflicts:
	Sisyphus1/src/cpsc433/Entity.java