modified the ability file.
resolve the conflict. modified the ability file.
Merge branch 'master' of github.com:nitinzd/brails
Merge branch 'master' of github.com:nitinzd/brails