Herp to the derp
Merge branch 'master' of github.com:dcorwin/15237hw4

Conflicts:
	static/grocery.js