cancan part 0.5
Merge remote-tracking branch 'upstream/master'
cancan 0.5
Merge pull request #12 from jaasimpolin/master

can can 0.5