its telling me too
it wants me tooMerge remote-tracking branch 'upstream/master'

Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/maps/Map.java
Merge pull request #37 from WClement/master

Merge pull request #6 from Runecat/master
all waves and mobs
Merge pull request #38 from ii-BLACKREAPER/master

waves and mobs bitchez
Tower Changes
buying towers and such
Test Panel and mob sprites
money!
Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/maps/Map.java