Added Building Types
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2
Commited some stuff, to try ang get back on track with master.

Conflicts:
	src/main/Unit.java