prepare for room addition
Merge branch 'cs410-d3MarkerAnimation' of https://github.com/extempest/cs410 into cs410-d3MarkerAnimation

Conflicts:
	simulator/pathFollow.js