create devise user
Add admin and volunteers
Add users controller, works with admin and volunteers
Add new user mailer create
Move logic to user model from controller
Add welcome controller
 added bourbon etc
Add custom mailer, email for registration
Install rspec
Fix merge conflicts
Fix merge conflicts
Add user factory
Add simple user_controller tests
Add authority gem
add models and add/edit join tables
Merge pull request #4 from maebeale/release-1

add models and add/edit join tables
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #3 from dazm12/release-1

Add Devise, Users
 bourbon
Merge pull request #6 from jcward10/release-1-mailers

bourbon