before pull
work from server
Merge branch 'master' of https://github.com/xavocinternational/atkschool