Initial commit
Merge https://github.com/jdlunger/csc286a4