Merge pull request #19 from eatsafe-sa/mariom1231

Mariom1231
conflicts editing
Merge pull request #20 from eatsafe-sa/travtex

conflicts editing
main blade update
Merge pull request #21 from eatsafe-sa/travtex

main blade update
initial commit zipcode array

zip codes separated by sides of town and specific areas
Admin authentication, boilerplate views
Merge pull request #22 from eatsafe-sa/travtex

Admin authentication, boilerplate views
Merge branch 'master' into chris-reyna
Merge pull request #23 from eatsafe-sa/chris-reyna

Chris reyna
working prototype with ArcGIS
mod map
Home blade update login

added login button with action to route showlogin
Merge pull request #26 from eatsafe-sa/travhome

Travhome
updated iframe for fusion table
deleted file
Merge branch 'master' of https://github.com/eatsafe-sa/eatsafe

Conflicts:
	app/views/map.blade.php
Merge pull request #25 from eatsafe-sa/chris-reyna

Home blade update login
Revert "deleted file"

This reverts commit 076f5c7e4e8f8c4f84d0dd8517890e7e0dc3edfb.