committed dropoff
a lot of things
Merge branch 'master' of https://github.com/pviolette3/food-pantry

Conflicts:
	app.js