Remove unwanted text from view
Merge branch 'master' of https://github.com/matus85/lms299

Get latest code with Teacher view changes
Update view and controller based on changes to Teacher code
Fix conflicts