revert back to working
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/ColouredBandDetector.cpp
Added Class Diagram
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/ClassDiagram.cd
Merge branch 'master' of github.com:FourthYearComputerVisionProject/ARProject

Conflicts:
	4thYearAR/ColouredBandDetector.cpp
	4thYearAR/main.cpp
Modified the detector to use flags for either the coloured band detector or the histogram detector

The histogram detector also now only runs once every 5 times