Finished terrain
Merge branch 'master' of https://github.com/gerardsimons/CGA_Game

Conflicts:
	SpaceShip.cpp
	main.cpp