more navbar changes
commiting actual changes this time
Merge branch 'master' of github.com:emmaviolet/photo_sharing_app