added grade book content
Merge branch 'chats'

Conflicts:
	sass/main.scss
fixed conflict
Merge branch 'master' into chats