Correct Merge conflict
Update .gitignore
Correct test
Merge branch 'master' of https://github.com/pierregerhard/SCHNAPS
correct conflict