Timetable generation - first day of the year
Merge remote-tracking branch 'origin/master'

Conflicts:
	Timetable.py