My Changes So Far
Merge branch 'master' of github.com:antbanks2014/canny-opencl

Conflicts:
	src/serialimageprocessor.cpp
Merge
Hyst Serial