Search now live
Merge branch 'master' of https://github.com/cdcueva/oliwi into incorperate_search
Merge pull request #104 from cdcueva/incorperate_search

Incorperate search