Added the sand texture
Merge branch 'master' of https://github.com/gerardsimons/CGA_Game.git
Created the model class and added lighting to GameSettings
Merge branch 'master' of https://github.com/gerardsimons/CGA_Game.git

Conflicts:
	GameSettings.h
	main.cpp
	terrain.cpp