typo in app.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/server/app.py
starting with tutorial