Merge pull request #3 from CST316GroupO/maste