Ground plane filled in
Merge branch 'TextureLoading'

Conflicts:
	src/GroundPlane.cpp
	src/game.cpp