Merge pull request #17 from RKJuve/tim-dev

Added status update socket events on client and server, will need to be ...
added in teacher name syncing from ryan-dev
Merge pull request #18 from RKJuve/ryan-dev2

added in teacher name syncing from ryan-dev
merged app.js - there were no real conflicts