backup 2013-01-28
first implementation of the search function
Merge pull request #27 from jeffwong/backup20130128

Backup20130128