situation under control :D
Merge branch 'master' of github.com:maciejkocyla/TaskMaster