Merge pull request #4 from cavedude00/master

merge from cavedude00:master
Merge pull request #5 from cavedude00/master

merge from cavedude00:master
indented mac.cpp and renamed some variables.
Merge branch 'master' of https://github.com/regneq/Server
Merge pull request #208 from regneq/master

indented mac.cpp and renamed some variables.
Merge pull request #14 from cavedude00/master

merge from cavedude00:master