Adding the first tile works
Merge branch 'master' into tileplacement

Conflicts:
	src/Game.java
	src/GridComponent.java