Added buildBuilding
Merge branch 'master' of github.com:bcasias/SoftwareFinal

Conflicts:
	bin/civTests/GameManagerTests.class
	bin/civilization/Civilization.class
	bin/land/Land.class
	bin/sticksAndStones/GameManager.class
Test commit