initial commit
Merge https://github.com/treziapov/cs414