fix major
Merge branch 'master' of https://github.com/microdevil/new_campus