Merge pull request #53 from ThomasRahn/Alan

Commenting
Merge branch 'Development' of github.com:ThomasRahn/soen390 into Alan