delete

deleted
Merge remote-tracking branch 'origin/master'

Conflicts:
	testtiff4.py