fixes merge conflict
fixes the partial for the users form
fixes merge conflicts
Merge branch 'master' into jamesbranch
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
makes the venue show page look better. changes some of the divs. adjusts the padding around things to make things line up.
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
Merge pull request #73 from JBrianGordon/jamesbranch

Jamesbranch