Torony hato es stone fejleszt
Merge remote-tracking branch 'origin/master' into develszaki
Merge remote-tracking branch 'origin/master' into develszaki
Obstacle epit fejlesztes by Adam
Merge remote-tracking branch 'origin/master' into develszaki
Added bonus mana after death function
Merge branch 'master' of https://github.com/pbartha/TheTwoTowers

Conflicts:
	src/buildings/towers/Tower.java