grade calculation unit test
Merge branch 'master' of github.com:burke-software/django-sis into unit_test
Appease SQLite
Merge branch 'master' of github.com:burke-software/django-sis into unit_test
new unit test
pulling in changes from remote
.gitignore change
Merge branch 'develop' of github.com:burke-software/django-sis into develop

'pulling in develop'