login working, logout should be working
Merge branch 'master' of https://github.com/jbernie2/csc210final into john
Merge branch 'master' of https://github.com/jbernie2/csc210final into john
index page looks better, working on getting sessions working
index page looks better, working on getting sessions working
fixing merge conflicts