The base code
Merge branch 'dkharley' of https://github.com/dkharley/CS179_Project1 into dkharley