Merge CSC517 project e814
Merge pull request #1 from akofink/master

Merge CSC517 project e814