Merge pull request #17 from jpecht/master

added to search functionality
highlight function adds .active class, no CSS yet
Merge remote-tracking branch 'origin/master'
Merge pull request #18 from jpecht/master

search fix
Highlight works, may want to change stylign in the future
Merge remote-tracking branch 'upstream/master'
update