first commit olivier
gitignore modified
merge project
good commit