added non maximum supression
Merge branch 'master' of https://github.com/ReubenJCarter/ImageProcessing

Conflicts:
	scr/process.h