change gitignore to unalowed DS_Store files (OSX)
Merge branch 'master' of github.com:unil/iafbm
Merge branch 'master' of github.com:unil/iafbm
Merge branch 'master' of github.com:unil/iafbm