Trying to fix a conflict.
Trying to fix conflict again.
Merge branch 'master' of https://github.com/ccopper/InstantVis

Conflicts:
	Sprint1/script/submit.js