Fixing some things.

The room, it does not work.
just working
moar stuff
stuff
testing

trying to find what's wrong
student view added

We've still got shit tons to do
Merge remote-tracking branch 'origin/Brian-Branch'