WIP
Merge branch 'master' of github.com:JohnAmican/merch-perch

Conflicts:
	app/views/zvents/index.html.haml
Merge branch 'master' of github.com:JohnAmican/merch-perch

Conflicts:
	app/views/layouts/application.html.haml