Merge pull request #4 from Runecat/master

s
Merge pull request #27 from ii-BLACKREAPER/master

Test
added a bunch of gui shit
Merge pull request #5 from Runecat/master

gui shit
Fixed logic issues and cleaned up code
checking if map will be added
Fucked with tile a bit
Pretty much nothing
Tower blaidkadmk
Merge remote-tswfwhatasts
racking branch 'upstream/master'

Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/model/Spawner.java
Added some pieces of code to Game
Added Updated Sprites
Added list of indexes for each Tower Sprite
Merge pull request #28 from ii-BLACKREAPER/master

added new waves
Fixed logic issues and cleaned up code
Fucked with tile a bit
Pretty much nothing
Tower blaidkadmk
Added some pieces of code to Game
Added Updated Sprites