something
bug fixed
Merge branch 'origin/master'

Conflicts:
	app.py
	templates/landingpage.html