從 Paris 修改了 concept.md
update and fix conflict concept
Merge pull request #2 from wastemobile/paris

從 Paris 修改了 concept.md