initial commit
Merge branch 'master' of github.com:carneeki/comp343-assignment2