Merge branch 'chats'
creating markup for grade book
Merge branch 'master' into chats