this works
Merge branch 'mvn_2' of https://github.com/raitsev/VirtualClassroom into mvn_2