fixed views
Merge branch 'master' of https://github.com/TheFuzz1991/claremont_munchies

Conflicts:
	claremont_munchies_site/claremont_munchies_site/urls.pyc