Merge branch 'master' of https://github.com/bobthenameless/musthe_img_gen

Conflicts:
	README.md
Merge branch 'master' of https://github.com/bobthenameless/musthe_img_gen

Conflicts:
	README.md