Merge pull request #4 from niwatoribaka/master

templates
Added search functionality, not working yet
Fixed merge conflict
still templates