initial commit
Merge https://github.com/jciochon/COMP153