0
Merge branch 'master' of https://github.com/xiechao06/Flask-Report

Conflicts:
	flask_report/templates/report____/report.html