removed numpy dependence
Merge branch 'master' of github.com:mdipierro/lms299
Merge branch 'master' of https://github.com/mdipierro/lms299

Conflicts:
	controllers/gradebook.py