1
Merge branch 'master' of https://github.com/dedalgr/coffee-trade

Conflicts:
	.gitignore