Syncing
Commit to fix

Merge branch 'master' of github.com:Hacym/flask-game

Conflicts:
	config.py