qwerty
Merge branch 'master' of https://github.com/Erep26/cozy-octo

Conflicts:
	client/public/index.html