Image creation
Merge branch 'master' of https://github.com/tcoatale/Makefile-Generator

Conflicts:
	scripts/parser.js