second attempt
Merge branch 'master' of github.com:sweider/Tasker

 blablabal