add conflice.leeche2
Merge branch 'master' of https://github.com/sehopark/opentutorials_git_sehopark