Mass commit
Merge branch 'Sharon' into alex
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