checking if map will be added
Merge remote-tswfwhatasts
racking branch 'upstream/master'

Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/model/Spawner.java