LETS DO THIS
Fixed the overeagerness
Fixed?

Merge http://github.com/SebastianMerz/calalert

Conflicts:
	app.py