modified
Merge branch 'master' of https://github.com/whetlab/Whetlab-Matlab-Client
Merge branch 'master' of https://github.com/whetlab/Whetlab-Matlab-Client
modified
Merge branch 'master' of https://github.com/whetlab/Whetlab-Matlab-Client
modified
modified
modified
Merge branch 'master' of https://github.com/whetlab/Whetlab-Matlab-Client

Conflicts:
	examples/course_assignment/whetlab_student.m
modified demo
modified demo
modified demo