StartedGameGridStuff
Merge branch 'master' of https://github.com/d361pomeranz/GridDefender

Conflicts:
	main/GameScreen.java
	main/Grid.java
	main/Player.java
	main/StartScreen.java