Updating and tweaking.
Synced with adding teachers.
Merge pull request #1 from hdavidzhu/integration

Integration