a3003a758d
Conflicts: src/app/index.coffee src/app/tasks.coffee styles/app/index.styl views/app/index.html views/app/settings.html views/app/tasks.html