Updated app.py
Merge branch 'master' of https://github.com/JTKBowers/kelvin

Conflicts:
	app.py
Fixed merge conflict.