Variable additions

Cost description
Merge remote-tracking branch 'origin/master'

Conflicts:
	flask_app.py