Merge branch 'master' of github.com:CrazyTeam/classroomguide
Merge branch 'master' of https://github.com/CrazyTeam/classroomguide.git