Merge branch 'grid'

Conflicts:
	src/Barrage.java
	src/Defense.java
	src/Structure.java