done
Merge branch 'merging' of https://github.com/alexaliu/cs184final into merging