adding javascript search feature
finishing more search and fixing merge conflicts