added mailmap
Merge branch 'master' of github.com:barthoz/ogogame