Added lots of things
Merge branch 'master' of https://github.com/CallaJun/TaskMate