setting up testing gemfile
merging in again
merged in start of testing pull to chris2
cleaning up after pulling- start of user testing
Merge branch 'master' into chris2
set up much of cancan with admin user role
started cancan testing admin