did some work on week two
some more changes
more changes
Merge pull request #12 from englishandy/master

did some work on week two