Merging changes
Merge branch 'roderick' of github.com:Harvard-ATG/HarvardCards into roderick

Conflicts:
	harvardcards/templates/base.html
	harvardcards/templates/index.html