Testing branching
Implemented main jumbotron page, with broken navigation
Cleaning up jumbotron page and removing code that's in layout
Logo2
Merge branch 'marketing'