Have to pull Classified code
To Push Class Diagram

Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv

Conflicts:
	Edge_Detector/CMakeLists.txt
	Edge_Detector/src/edge_detector.cpp
	Video_Processing/src/Convert_to_Grayscale.hpp
	Video_Processing/src/libraries.hpp
	Video_Processing/src/video_processing.cpp