Added secrets.yml
Added unicorn webserver
Added unicorn config file
Added Procfile
Merge branch 'master' into users

Conflicts:
	Gemfile.lock