Migrated
Merge branch 'master' of github.com:vltlabs/dogather

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
Merge branch 'master' of github.com:vltlabs/dogather

Conflicts:
	app/views/layouts/application.html.erb
Stash
Merge branch 'master' into feature/2nd-pass

Conflicts:
	app/views/events/show.html.slim
COSMETIC
Merge pull request #9 from vltlabs/feature/2nd-pass

Feature/2nd pass