Zach's work on Q6
Merge branch 'master' of github.com:kubryant/EECS484