Lab 2 write up
Merge branch 'lab2'