merge conflict
search field working
Merge pull request #47 from Eventalist/yoshiemuranaka

Yoshiemuranaka