Resolved merge conflict
Moved banner out of header to front-page
Added search module
Finished styles for the nav, added styles for search, started using css sprites