t
Merge branch 'master' of https://github.com/varmanr/Wiki

Conflicts:
	mysite/mysite/settings.py