added cancan functionality
updated cancan.  works now
fixed gemfile.lock merge conflict
Merge branch 'cancan' into development