Server Setup
Merge branch 'master' of https://github.com/iSharon/Mag_ChaTor.git