Lab2, Ex1: Refactored
Lab2, Ex1: Done before presentation
Merge remote-tracking branch 'origin/master' into lab2