better example
Merge branch 'master' of https://github.com/TEAMWORKGIT/creativecoffee

Conflicts:
	app/bootstrap.php
	composer.json