Combining maps works (sort of) now
I don't remember what I changed
Merge branch 'master' of https://github.com/jlsorrells/rbe3002lab3

Conflicts:
	path_following.py