Changed commandline parsing
Merge branch 'master' of https://github.com/h-wang94/cs184final