tow
Merge branch 'master' of https://github.com/Frotty/ForestDef
new waves
Merge branch 'master' of https://github.com/Frotty/ForestDef
flamethrower
updtzs
Merge branch 'master' of https://github.com/Frotty/ForestDef

Conflicts:
	wurst/init/GameInit.wurst
	wurst/towers/Tower.wurst
Merge branch 'master' of https://github.com/Frotty/ForestDef

Conflicts:
	wurst/towers/WaveTower.wurst