settings conf

Conflicts:

	MyWebsite/settings.py