Merge branch 'master' of https://github.com/davidjosepha/campus-textbook

Conflicts:
	campustextbook/views.py