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

Conflicts:
	sass/main.scss
Merge branch 'chats'

Conflicts:
	sass/main.scss