wercker deploy
testing the base structure
Merge branch 'heroku-master'

Conflicts:
	app/controllers/welcome_controller.rb
	app/models/step_collection.rb
	app/views/welcome/index.html.slim
	config/database.yml
	db/schema.rb
	lib/tasks/upload_datastore.rake
	wercker.yml