Update gitignore
Update TODO
Merge branch 'master' of https://github.com/medvid/acl