first commit
Merge branch 'master' of github.com:giacomomacri/image_master

Conflicts:
	.gitignore
	README.md