rien de rien
added doc
readme
merge conflicts
fixed doc
Merge branch 'develop'