Finished assignment 2
merge