settings.py
Merge branch 'master' of https://github.com/rivace/ffway

Conflicts:
	settings.py~