added cancan
merging profile changes
:w
gerge branch 'dev' of github.com:mattstuddert/rss_feed_reader into dev