refs #3 #19

removed cancan
Merge branch 'master' into authority
refs #3 #19

Added authority gem
Merge branch 'master' into authority