Mass commit
Merge branch 'Sharon' into alex
Merge pull request #20 from blind-squirrel/Sharon

Sharon
Merge pull request #21 from blind-squirrel/Sharon

starting on register page
Merge branch 'master' into alex
Fixed formatting issue on the splash screen and about page
Updated user controller to implement RemindableInterface
Merge pull request #22 from blind-squirrel/alex

Alex
Merge pull request #23 from blind-squirrel/Sharon

preparing to merge
ability to add new user added, but email and password are not logging into the db