stuff
Merge branch 'master' of https://github.com/parasm/retention

Conflicts:
	app.py