user/non-user nav bar complete
adjusting merge conflict in schema
Merge branch 'master' of github.com:mike590/Gnarwhales