new show page
Merge branch 'master' of https://github.com/kyleowens10/coinplay

Conflicts:
	app/models/party.rb