Added hw5
Fixed merge