Merge pull request #4 from CST316GroupO/master

Merge Lastest Changes