commit under 1 hour will run
Merge branch 'master' of https://github.com/extempest/cs410

Conflicts:
	simulator/pathFollow.js