dicks, dicks everywhere
Merge branch 'master' of https://github.com/JohnAmican/merch-perch

Conflicts:
	app/controllers/zvents_controller.rb
	app/models/zvent.rb