use unicorn via procfile
Merge branch 'master' of github.com:ismith-adam/myprimeplace

Conflicts:
	config/database.yml