Week7b

This is a git conflict issue. It should be resolved and not committed.