Initial commit
Merge https://github.com/maxdgodfrey/COMP261AssignmentTwo