Started on lab4, for real this time
Merge branch 'master' of github.com:Grulfen/tddc78