Latest version of solWeek2.hs
Merge fix