Added admin attribute to users table
commit before merge with master
before master merge
Finished writing controllers for administrative features
Added tests for full Administrative CRUD control
Merge branch 'master' into admin_roles
Resolved merge conflicts.
Initial commit.
Added first email test (checks to ensure that shop creator is emailed when a review of their shop is submitted).
Implemented email. TEST PASSED
added the view for email
Merged master
Merge branch 'master' into email_user
Fixing the admin
Admin can see a list of all the reviews
All admin tests passing
Merge branch 'master' into admin_roles
Deleted shops controller
Ready for merger
Merge pull request #22 from LaunchAcademy/admin_roles

Admin roles