local_settings deleted
Merge branch 'master' of github.com:MPBA/webvalleysite

Conflicts:
	local_settings.py