Updated much of the Tower and Attack logic
Merge remote-tracking branch 'upstream/master'
holla
Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/model/Game.java