changing some video playback properties
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/VideoDrawManipulator.cpp
got color back in the time
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/VideoDrawManipulatorFactory.cpp
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/main.cpp
added a crosshair and changed the color
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject
changed size of hte detector
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject