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

Conflicts:
	flask_report/base.py
0
Merge pull request #8 from xiechao06/issue3

Issue3