Just a few things
Merge branch 'master' of https://github.com/DxTania/cs118-project1