for conflict purposes
Merge branch 'master' of https://github.com/j0k0/Info3