latest changes
Merge github.com:Unschkilled/Homework-Organizer
latest changes