Adding search functionality
adding files
merge collisions fixed
Merge pull request #4 from amdziuk/Anup

Anup