changed settings.py
Merge branch 'master' of github.com:Prithvirajbilla/event

Conflicts:
	events/settings.py