playing with settings
Merge branch 'master' of https://github.com/ksl0/testsite

Conflicts:
	mysite/settings.py