Command-line switching
Merge branch 'master' of github.com:WaveMotion/cs283hw4