Deleted lowercase u user.php
Merge branch 'master' into caitlin
Merge branch 'master' into caitlin
Merge pull request #14 from sweetrocker22/caitlin

Deleting bad user model