updated for command line control
Merge branch 'master' of https://github.com/adneufel/CS499Project1