not sure what changes were made..
Merge branch 'master' of github.com:h-wang94/cs184final