updating settings
Merge branch 'master' of https://github.com/marcusglowe/checkmark
updated hover click on grades.html
merge
merge
Merge branch 'master' of https://github.com/marcusglowe/checkmark
updated profile, ui
Merge branch 'master' of https://github.com/marcusglowe/checkmark

Conflicts:
	gr4/index.html