indented mac.cpp and renamed some variables.
Merge branch 'master' of https://github.com/regneq/Server