merge with some bloup
merge

Merge branch 'master' of github.com:antoine-lizee/kp

Conflicts:
	Scripts/Launch.R
bloup