lab2 setup
4.0 done
Resolved pull conflict