working on login
Merge branch 'master' of https://github.com/jbernie2/csc210final into john
still working on login.php
Merge branch 'master' of https://github.com/jbernie2/csc210final
Merge branch 'john'
Merge branch 'master' of https://github.com/jbernie2/csc210final
logout and login working.... i think