updated welcome view + nav bar
Merge branch 'master' of github.com:emilysimonton/super_secret