updated cancan.js
added tests
added .DS_Store to gitignore