changes to GameMap constructor
modified GameMap constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/vooga/towerdefense/gameElements/Tower.java