merge
new commit

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

Conflicts:
	app.db
	app/models.py
Preparing to create 'edit' form
Merge branch 'master' of https://github.com/hack4impact/gpcah into small-map-update

Conflicts:
	app/templates/admin_resources.html
Adding food resource editing capability
Added 'remove' button functionality on admin page
merged
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
updated init
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
Removed unused code
Added additional boolean fields to FoodResource model