convert dm to m, now working
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assignment2.py