a
b
Merge branch 'master' of https://github.com/foo/mouse-retina

Conflicts:
	Makefile
	src/edge-detection-client/edge-detection-client.cpp
Detector and matcher for edge detection added