Quote fix
Merge branch 'master' of https://github.com/avstin/cagemccoy

Conflicts:
	local_settings.py