Commit changes
Merge branch 'master' of https://github.com/pviolette3/food-pantry

Conflicts:
	.gitignore
	app.js