stylin
Merge branch 'master' of github.com:angusiguess/plungr

Conflicts:
	app/views/stalls/showplops.html.erb