teacher update 1
Merge branch 'master' of github.com:vineetgopal/minimaestro
teacher update 2
Merge branch 'master' of github.com:vineetgopal/minimaestro