changed readme
Integrated origin/ready/f1
Merge branch 'master' into ready/f1

Conflicts:
	app.py