finished front end login log out
Merge branch 'master' of github.com:u-jo/Cal