Merge pull request #4 from xshen4/develop

Develop
Updated teacher side