Initial code for lab 2
Merge branch 'lab1' into lab2