Updated homework to include homework 3.
resolve merge conflict