Format made / lost prettier
Merge branch 'master' of github.com:um-cseg/chez-betty

Conflicts:
	chezbetty/views.py