Merge branch 'master' of github.com:itsme-/server.configs