Pulling to start work
Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv

Conflicts:
	Video_Processing/src/Sharpening.hpp
Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv

Conflicts:
	Video_Processing/src/video_processing.cpp
Pulling to work
Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv

Conflicts:
	DisplayImage/src/DisplayImage.cpp
	Video_Processing/src/video_processing.cpp
Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv

Conflicts:
	Video_Processing/src/video_processing.cpp
Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv