Creating template
Merge remote-tracking branch 'quickstart/master'

Conflicts:
	config.ru
Updating ENV vars