lots of testy files
Merge branch 'master' of https://github.com/Lemmily/game_test

Conflicts:
	src/Entity.java