.gitignore (on master)
Merge branch 'devel'