fixed conflict
changed profile font
added partial to logged in top nav
removed period
Merge pull request #85 from tiger-swallowtails-2014/SC_Edit_button

Sc edit button
fixes edit bar; merging. Kelly