initialization
Merge branch 'master' of https://github.com/gavinbird/CS276-P1