updating user to include email
updating user to include email
Merge branch 'master' into volunteers
email list
testing user can_email flag
Merge pull request #23 from bbttxu/gems

Gems
Merge pull request #22 from bbttxu/volunteers-email

Volunteers email
adding test
fixing syntax on test
fixing syntax for rspec3
Merge pull request #25 from bbttxu/helpers

Helpers
Merge pull request #24 from bbttxu/volunteers-email

fixing syntax for rspec3
fixing count of sessions displayed on volunteer page

sessions ~= shops
removing form elements to change volunteer and shop
Merge pull request #26 from bbttxu/issue-19

fixing count of sessions displayed on volunteer page
Merge pull request #27 from bbttxu/issue-12

removing form elements to change volunteer and shop
removing application helper in lieu of using gem options properly in view
Merge pull request #28 from bbttxu/helpers

removing application helper in lieu of using gem options properly in vie...
adding spec for current shops
Merge pull request #29 from bbttxu/shops

adding spec for current shops