small formatting changes
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject
minor formatting changes
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	OpenCVwithOpenGL/CriticalSection.h
	OpenCVwithOpenGL/OpenCVwithOpenGL.vcxproj.filters
Changed the box manipulator to draw the system time.

started adding opengl textures for the hud but it isn't showing yet.
Merge branch 'glek-refactor' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/4thYearAR.vcxproj
	4thYearAR/DrawBoxManipulator.cpp
	4thYearAR/StereoRender.cpp
	4thYearAR/StereoRender.h
started using addweighted instead of opengl calls
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/StereoRender.cpp
	4thYearAR/VideoDrawManipulator.h
	4thYearAR/main.cpp
got it working in the rift
Added the battery icon to the screen