Improve tasks, add separate task categories data structure
Merge pull request #21 from anotherwise/master

Improve tasks, add separate task categories data structure