merge
new commit

Merge branch 'master' of https://github.com/hack4impact/gpcah into nnarang

Conflicts:
	app.db
	app/models.py
changed header colors to red for admin page
fixed column spacing, styled 'change password' page
merged
added header formatting and spacing for *.html in flask_user (change password, register pages, etc.)
added border to pins - mbb_*.png
Merge pull request #34 from hack4impact/nancy

fixed header styling/spacing for flask_user pages (change password, register, etc.), added bordered pins to img/
Merge branch 'master' of https://github.com/hack4impact/gpcah into small-map-update
Updated zipcode search
"zipcode"
Merge branch 'master' of https://github.com/hack4impact/gpcah into nnarang
Merge pull request #35 from hack4impact/nnarang

updated zip code search
Merge branch 'master' of https://github.com/hack4impact/gpcah into small-map-update

Conflicts:
	app/models.py
	app/views.py
Added comments
Timeslot error is now correctly identified again.
Increased readability of variables.py.
Timeslot front-end correctly updates when user edits an existing food resource or enters an incorrect timeslot.
Food resource type dropdown updates correctly when adding or editing a food resource