add basic search functionality
javascript changed to be deleted
resolved merge conflicts