Updating image in nav bar
merging master into my branch