database.uml in repo, figaro, unicorn
Merge branch 'master' of github.com:elpassion/planning_poker_api

Conflicts:
	.gitignore