fixed testinput and stuff
Merge branch 'master' of https://github.com/niilohlin/homework

merged lab3