Merge pull request #8 from ThatCanadianGuy/master

Getting new changes from spencer
Added yesy

Added yesy
Merge pull request #10 from ThatCanadianGuy/Branche-de-Jean-Luc

Branche de jean luc