implementing cancan
 Merge remote-tracking branch 'origin/master'