merge conflict
Update readme.md
Update readme.md
Update readme.md
search field working
Merge pull request #47 from Eventalist/yoshiemuranaka

Yoshiemuranaka
fixed merge