jocke test

fail
Merge remote-tracking branch 'origin/master'

Conflicts:
	TSBK03_Project/TSBK03_Project.layout
	TSBK03_Project/bin/Debug/phong.frag
	TSBK03_Project/bin/Debug/phong.vert
	TSBK03_Project/bin/Debug/terrain.tga
	TSBK03_Project/obj/Debug/openoliver/openoliver/common/loadobj.o
	TSBK03_Project/obj/Debug/openoliver/openoliver/main.o
	openoliver/openoliver/main.cpp
	src/KeyMouseHandler.cpp
	src/Terrain.cpp