Merge pull request #2 from CST316GroupO/master

Grabbing new changes.