first commit
Merge branch 'master' of https://github.com/12sm/magnum-test