Merge branch 'master' of https://github.com/rworr/StudentHub

Conflicts:
html/textbooks.html
studenthub.py
Merged conflicts