Merge pull request #3 from Edgardecay/branchweektwo

Branchweektwo
Merge pull request #5 from Edgardecay/master

Merge pull request #3 from Edgardecay/branchweektwo