gitignore
Merge branch 'master' of github.com:jeromedecoster/mai1