ultime modifiche
Merge branch 'master' of https://github.com/AlexBasile/Ippocrate_Calendar

Conflicts:
	CalendarUtility.py
	main.py