changed register
Merge branch 'master' of https://github.com/jbernie2/csc210final
added form validation
Merge branch 'master' of https://github.com/jbernie2/csc210final
working on login
Merge branch 'master' of https://github.com/jbernie2/csc210final into john
testing time
still working on login.php
Merge branch 'master' of https://github.com/jbernie2/csc210final
Merge branch 'john'
added some alerts
javascript is a cruel mistress
javascript is a cruel, cruel mistres
Merge branch 'master' of https://github.com/jbernie2/csc210final
logout and login working.... i think
Merge branch 'Joseph'