stuff and things.
Merge branch 'master' of https://github.com/prblaes/ImageColorization

Conflicts:
	colorizer/colorizer.py
	main.py