Finished lab 5
Merge https://github.com/paul80/Lab5-3