LAB 04 - TASK 16 FIXED
lab04 finished completely
lab 05 - tasks 1,2,4 done, task 3 ???
Merge pull request #3 from hannarud/master

lab 04 finished, lab 05 started, tasks 1,2,4 done, task 3 ???