First commit by Summer
Merge https://github.com/smithy12/cs246