added source folders to lab2
fixed conflict