f
Merge branch 'dev' of https://github.com/blackdoor/GUmap into dev

Conflicts:
	src/com/blackdoor/gumap/BuildingInfo.java

its fine