port fix
Merge remote-tracking branch 'heroku/master' into tic-tac-toe

Conflicts:
	app.py
Merge branch 'tic-tac-toe' of https://github.com/alexjpaz/sandbox into tic-tac-toe