Merge pull request #44 from pannellr/master

updating rickey's branch
Merge pull request #45 from pannellr/vivian2

update the project
Merge pull request #46 from pannellr/pannellr

Merge pull request #44 from pannellr/master
fixing user code
user login and sessions working
adding a bunch of pyc files I don't understand
Merge branch 'master' into pannellr
trying again
Trying again...
Merge branch 'pannellr' of https://github.com/pannellr/3132GroupProject into vivian2
add State