test Arnaud (to cancel)
Merge branch 'master' of https://github.com/briquebalant/myapp

Conflicts:
	index.js