whatever
Merge branch 'james'

Conflicts:
	claremont_munchies_site/claremont_munchies_site/settings.pyc