added solution to problems 1 and 2