convert() added to image loading
Merge branch 'master' of https://github.com/andva/granny

Conflicts:
	main.py