adding jumbotron, search bar, changing logo animation
adjusting for merge
merging