working on lab02 and 03
info3 lab2
fixed merge conflict