Fixed some stuff
Merge branch 'master' of https://github.com/joePasz/bar-website

Conflicts:
	bar-website-rails/db/seeds.rb
Fixed more stuff