Fixed doc conflict
fixed readme merge
Merge pull request #2 from chocopoche/master

Fixed doc conflict