Merge pull request #2 from ThatCanadianGuy/master

test
Merge pull request #3 from ThatCanadianGuy/Spencer-Branch

Merge pull request #2 from ThatCanadianGuy/master