update to lab 3 files
merge