Adjusted API/Scraper to catch errors
Merge branch 'master' of https://github.com/ccopper/InstantVis

Conflicts:
	Sprint1/script/submit.js