minor fix
Merge branch 'master' of https://github.com/bethlakshmi/GBE2

Conflicts:
	expo/expo/settings.py