test
Merge branch 'master' of github.com:da-vinci/profilr-coming-soon

Conflicts:
	.env.sample
Merge branch 'master' of github.com:da-vinci/profilr-coming-soon

Conflicts:
	app/controllers/subscribers_controller.rb
	app/views/home/index.html.erb