made changes to manifest
fixed merge conflict
Merge branch 'master' of https://github.com/AlvinYuan/cs160