Merge pull request #2 from smskelley/master

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

Conflicts:
	src/serialimageprocessor.cpp
Merge
Hyst Serial
Small Change
Merge pull request #24 from antbanks2014/master

Serial Hysteresis