work on da hero types
Merge branch 'master' of https://github.com/Crigges/HotN

Conflicts:
	HotN/wurst/war3map.j