Menu mockup
Merge branch 'master' of https://github.com/FourthYearComputerVisionProject/ARProject

Conflicts:
	ARProject/ARProject.vcxproj
	OpenCVwithOpenGL/RenderableImage.cpp
	OpenCVwithOpenGL/StereoViewer.cpp
	OpenCVwithOpenGL/main.cpp
	OpenGLShaderTest/OpenGLShaderTest.vcxproj
merged