Added merged week1 sol2 and bonus exercises