Added logo to nav bar
Master merged to my branch
Changed buttons to white
Changed buttons to white