stuff
Merge branch 'master' of https://github.com/FourthYearComputerVisionProject/ARProject
more stuff
Merge branch 'master' of https://github.com/FourthYearComputerVisionProject/ARProject
even more stuff
Merge branch 'master' of https://github.com/FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/VideoDrawManipulatorFactory.cpp