Sorting in
Merge branch 'master' of https://github.com/hmurraydavis/Path_Planning

Conflicts:
	dijkstra/parse_map.py