Changed search page layout, changed blue to grey, added picture
fixed merge conflict
Merge branch 'nathanDev' into justinDev