cancan added
Merge pull request #6 from DanyTlaw/cancan

cancan added