added Makefile and a demo with test images
fixed Makefile conflictions