Reset to ab628be
Merge branch 'master' of github.com:kirnhans/cmuprints

Conflicts:
	index/models.py
	index/views.py