commit test
Merge branch 'master' of https://github.com/aminaud/Cloud

Conflicts:
	.gitignore