added cancan and role_model, now have 3 user roles
merging