add new branch
Merge remote branch 'origin/master' into develop

Conflicts:
	app.yaml
	bot.py
develop
edit app.yaml
Merge remote branch 'origin/master'
Merge branch 'develop'