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
fixes both the broken link when clicking on a user page when not logged in and makes it so that the links for venues on a user page actually link to the proper venue.
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
Merge pull request #89 from JBrianGordon/jamesbranch

Jamesbranch
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
makes the user photo on the venue index page a link to their show page
makes the venue picture a link_to on the venue index page
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
Merge pull request #91 from JBrianGordon/jamesbranch

Jamesbranch
fixes the flash error when creating venues. They now only last in one response cycle
I miss Kelly and Brian... finally makes the user dropdown in the navbar work. woo
Merge pull request #92 from JBrianGordon/jamesbranch

I miss Kelly and Brian... finally makes the user dropdown in the navbar ...
makes the venue pictures on user show page links
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
Merge pull request #93 from JBrianGordon/jamesbranch

Jamesbranch
makes user photos on venue show link_to
Merge pull request #94 from JBrianGordon/jamesbranch

makes user photos on venue show link_to