Reversed changes
Merge branch 'master' into barryn
Fixed team formatting of the navbar
Merge branch 'master' into alex
Commented showSplashScreen function in HomeController
Merge branch 'master' into alex
Reformat login page
Merge branch 'barryn' of github.com:blind-squirrel/blind-squirrel into alex

Conflicts:
	app/views/login.blade.php
Merge branch 'master' into alex
Added comment to home controller
Merge pull request #27 from blind-squirrel/alex

Alex
email reset
Fixed login functionality
Merge pull request #28 from blind-squirrel/alex

Fixed login functionality
Fixing the login
fixed width of the login screen
Merge pull request #29 from blind-squirrel/alex

Alex
fixed register link
Fixed line spacing
More text formatting in the login.blade.php