added register page. Modified login page. Working on change user info page
Merge branch
Merge branch 'master' into Sharon
Merge pull request #12 from blind-squirrel/alex

Alex
minor changes to update-user blade to clean directory prior to master merge
corrected conflict in app file
Initial commit of register.blade.php
Initial commit of Register Controller.php
Changed the login form to take text not just email addresses
Added route for register
Added register.blade.php
added index blade and can pull users. Will now add ability to delete and modify
Merge pull request #13 from blind-squirrel/Sharon

Sharon
Added Register view and controller
add roles to users & seed
save roles and merge master to local venkman
Merge branch 'master' of github.com:blind-squirrel/blind-squirrel
Merged master with alex
Merge branch 'master' into alex
Merge pull request #14 from blind-squirrel/venkman

Venkman
Merged master into alex
Merge branch 'master' into alex
updating to merge to pull down another version
Merge branch 'master' into Sharon
merging from master