updates
Merge branch 'master' of https://github.com/kilimchoi/calfoodalert into benortiz
Merge branch 'master' of https://github.com/kilimchoi/calfoodalert into benortiz

Conflicts:
	calfood/templates/static/index.html
Merge pull request #6 from kilimchoi/benortiz

Benortiz