initial commit
Merge branch 'master' of https://github.com/tanhaa/concordia-comp249-assignment1