finishes the venues controller tests
fixes the conflict in app/models/venue.rb
Merge pull request #7 from JBrianGordon/jamesbranch

Jamesbranch