Week 2 work
Merge pull request #14 from soundslikework/master

Week 2 work