detachments and clients
Merge branch 'master' of https://github.com/nadinejamila/workshop

Conflicts:
	.gitignore