Merge branch 'text-footer'
Merge branch 'master' of https://github.com/tyrbo/the_pivot
added logo to nav bar