Merge remote-tracking branch 'origin/Andrew' into Andrew

Conflicts:
	Debug/Project5.exe
	Debug/Project5.ilk
	Debug/Project5.pdb
	Project5.sdf
	Project5.v12.suo
	Project5/Camera.cpp
	Project5/Camera.h
	Project5/Debug/Axes.obj
	Project5/Debug/Camera.obj
	Project5/Debug/DirectionalLight.obj
	Project5/Debug/Light.obj
	Project5/Debug/Model.obj
	Project5/Debug/PointLight.obj
	Project5/Debug/Project5.log
	Project5/Debug/Project5.tlog/CL.read.1.tlog
	Project5/Debug/Project5.tlog/CL.write.1.tlog
	Project5/Debug/Project5.tlog/cl.command.1.tlog
	Project5/Debug/Project5.tlog/link.command.1.tlog
	Project5/Debug/Project5.tlog/link.read.1.tlog
	Project5/Debug/Project5.tlog/link.write.1.tlog
	Project5/Debug/Shader.obj
	Project5/Debug/ShadowMap.obj
	Project5/Debug/Texture.obj
	Project5/Debug/World.obj
	Project5/Debug/main.obj
	Project5/Debug/vc120.idb
	Project5/Debug/vc120.pdb
	Project5/Model.cpp
	Project5/Project5.vcxproj.filters
	Project5/Shaders/fragments.frag
	Project5/Shaders/shadowMap.frag
	Project5/Shaders/vertices.vert
	Project5/ShadowMap.cpp
	Project5/ShadowMap.h
	Project5/Texture.cpp
	Project5/World.cpp
	Project5/World.h