minor changes. should be consistent with everyone.
Merge branch 'master' of github.com:h-wang94/cs184final