Updated index and search bar
Merge remote-tracking branch 'origin/master'