implemented a simple searching system
fixed the mergin issues
Merge branch 'master' of github.com:hapn-at/hapn-at