new
new
new
final
Merge branch 'master' of github.com:HowToLove/Cloud-Lab
final
Merge branch 'master' of github.com:HowToLove/Cloud-Lab

Conflicts:
	cloud_lab/PrepareClass.html
commit
Merge branch 'master' of github.com:HowToLove/Cloud-Lab

Conflicts:
	cloud_lab/TeacherOnClass.html
	cloud_lab/js/PrepareClass.js
new
new