new year, new commit!
Merge branch 'master' of https://github.com/SilentCatVallis/HomeworkOP