Log in not working yet
Merge pull request #12 from sweetrocker22/db-greg

Log in not working yet
Deleted lowercase u user.php
Merge branch 'master' into caitlin
Merge pull request #13 from sweetrocker22/caitlin

Caitlin
Deleted lowercase u user...again?
Merge branch 'master' into caitlin