fixed up conflict
Merge branch 'project1' of https://github.com/jdcast/CS140-git into project1