Merge pull request #4 from CST316GroupO/master

Grabbing Gabe's retardedness