bugaga
Merge branch 'master' of https://github.com/KristinaGen/TimeTable

Conflicts:
	Logic/Readers/ReaderFromXML.cs