STYLING YO
DELETE MY ENV
Merge branch 'master' into feature/frontend

Conflicts:
	app/views/events/show.html.slim
merging
Merge pull request #18 from vltlabs/feature/frontend

Feature/frontend