fixed the thing
Merge branch 'master' of github.com:pviolette3/food-pantry
moving stylesheet forward
lalala
Merge branch 'master' of github.com:pviolette3/food-pantry

Conflicts:
	public/stylesheets/style.css
Merge branch 'master' of github.com:pviolette3/food-pantry