Finished #1, started #2
Merge branch 'master' of github.com:MIfA-Computer-Club/HW2