simplied code and makefile
Conflicts:
	examples/CImg_demo.cpp
	examples/Makefile