Added logic to add additional tiles
Merge branch 'master' into tileplacement

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