did stuff
Merge branch 'master' of https://github.com/raywu22/KendallHarvardSquareBarGraph

Conflicts:
	app.js
did more stuff