edits
Merge branch 'master' of https://github.com/rcrissup/tiff

Conflicts:
	main.py