merge conflicts
cleaned ability page
Merge pull request #78 from Tmee/cancan

Cancan