rewrite merged files
Merge branch 'newServer' of https://github.com/katismile/cross-and-zero into newServer