minor
Merge branch 'master' into lesson
incorporated the content from the prototype
resize whiteboard