added lab2
Merge conflict