cleaning up templates
Merge branch 'master' of github.com:um-cseg/chez-betty

Conflicts:
	chezbetty/static/css/chezbetty.css