live commit
local conflict resolved
Merge branch 'master' of https://github.com/thevikas/peertask
Merge branch 'master' of https://github.com/thevikas/peertask
Merge branch 'master' of https://github.com/thevikas/peertask