minor html changes
Added controllers
Merge branch 'master' of https://github.com/SimonV/VTeacher

Forgot to pull before commiting