fixes the friend problem. adds in mercury and it's working on the versions new page.
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire
fixes a bug with the navbar and makes the user image a link to their show page
Merge pull request #90 from JBrianGordon/jamesbranch

Jamesbranch