tedst

tst
Merge branch 'JacobGameScreen' of https://github.com/RustyHook/SquirrelTowerDefense into JacobGameScreen

Conflicts:
	core/src/com/squirrel/game/GameScreen.java
Merge branch 'JacobGameScreen' of https://github.com/RustyHook/SquirrelTowerDefense into JacobGameScreen

test