Merge pull request #1 from Edgardecay/branchweektwo

weektwo
Merge pull request #2 from Edgardecay/master

Week 05 Pull Request