add eiei in ReadMe.txt
fix conflict
Merge pull request #2 from nantachai/shaddock601-pleng

Shaddock601 pleng