fda
Merge branch 'master' of github.com:fkunneman/DEvents

Conflicts:
	calculations.py