email reset
Merge pull request #30 from blind-squirrel/alex

Alex
Mass commit
Merge branch 'barryn' of https://github.com/blind-squirrel/blind-squirrel into barryn

Conflicts:
	app/views/admin/index.blade.php
Merge pull request #31 from blind-squirrel/barryn

Barryn
add new coomits from barry & sharon
merge branch 'master' into venkman
Merge pull request #32 from blind-squirrel/venkman

Venkman
Initial commit of footer.blade.php in the master layout folder
Initial commit of navbar-dashboard.blade.php in the master layout folder
Made login and logout links buttons
fixed formatting in splashScreen.blade.php
reset password edits
add password reset
Merge branch 'master' into venkman
format password reset view & link to login page
Merge pull request #33 from blind-squirrel/venkman

Venkman
Merge branch 'master' into alex
Fixed text formatting on agout.blade.php