fixed merge conflict
partial request finished
Merge pull request #14 from CoolJorcz/accept-task

Accept task: request