Another commit same as last but fixed merging issues
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2

Conflicts:
	src/main/Building.java