building can attack
Merge remote-tracking branch 'origin/master'

Conflicts:
	BM-RTSGAME/Assets/FieldConstruction.unity
Merge branch 'master' of https://github.com/Bjeck/BM-RTS-game

Conflicts:
	BM-RTSGAME/Assets/FieldConstruction.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	BM-RTSGAME/Assets/FieldConstruction.unity