worked on assigment 4
merge
make file
merge