message
Merge branch 'master' of https://github.com/kilimchoi/calfoodalert
merging conflict resolved
initial conditionals for login
merger
merger
Update calfood/templates/static/index.html

added verify_fail as a variable
commit for no reason
tesing js redirect
Merge branch 'benortiz' of https://github.com/kilimchoi/calfoodalert
adding jquery
Create .gitignore
jquery verification
Merge pull request #1 from kilimchoi/benortiz

jquery verification
added hashing for password encryption