Add .gitignore
Merge branch 'devel'