added search hilight
Removed extra tracked file .netrwhist
fixed merge conflicts