end of flask mega v
Merge branch 'master' of https://github.com/amyrlam/earthmd

Conflicts:
	app.db