Completed search and ordering functionality, moved search to header
Fixed bug in application.css.scss
Resolved conficts and error from previous merge