changed header, added an exception for my dump pc
bugfixes, loading converting dem, resample image
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assignment2.py