Lab 6 DONE
merge