Merge pull request #2 from ThatCanadianGuy/master

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

Merge pull request #2 from ThatCanadianGuy/master
Merge pull request #4 from ThatCanadianGuy/Branche-de-Jean-Luc

test
Merge pull request #5 from ThatCanadianGuy/master

Update to master
Merge pull request #6 from ThatCanadianGuy/Spencer-Branch

Merge pull request #5 from ThatCanadianGuy/master
Added new changes

:dancer:
Merge pull request #7 from ThatCanadianGuy/Spencer-Branch

Added new changes
Merge pull request #8 from ThatCanadianGuy/master

Getting new changes from spencer