Reversed changes
Merge branch 'master' into barryn
Fixed team formatting of the navbar
Merge branch 'master' into alex
ability to add new user added, but email and password are not logging into the db
password and email are now being logged. Still missing auth checks
Commented showSplashScreen function in HomeController
Merge pull request #24 from blind-squirrel/venkman

Venkman
Merge branch 'master' into alex
Reformat login page
user can add photo when registering
Merge branch 'barryn' of github.com:blind-squirrel/blind-squirrel into alex

Conflicts:
	app/views/login.blade.php
Merge pull request #26 from blind-squirrel/Sharon

Sharon
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