resolve conflicts
added details and due date in task details
Merge branch 'master' of github.com:iamchenchen/simpleTask