fixes merge conflict
fixes the partial for the users form
fixes merge conflicts
Merge branch 'master' into jamesbranch
minor style tweaks to new venue picture
Resolve merge issues
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
takes orbit out of venue index and saves in welcome.html.erb for possible future use
Add parallax start page
Fix merge conflicts
Merge pull request #72 from JBrianGordon/brianbranch

Brianbranch
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 branch 'master' of https://github.com/JBrianGordon/WhAttire
Merge branch 'jamesbranch'
Merge pull request #73 from JBrianGordon/jamesbranch

Jamesbranch
does some work on the venues index page. padding and flush looks and all. review previews, review counts, and reviewer image.
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into jamesbranch
Merge pull request #74 from JBrianGordon/jamesbranch

Jamesbranch
Fix slide issue and style startpage