Update Makefile
Merge branch 'master' of https://github.com/victorianorton/SimpleImageManipulator

Conflicts:
	Makefile
change from c to c++