First commit
Merge branch 'master' of github.com:JohnLas/MMServer
test