adding test cases etc
adding changes to... hopefully it will left me push
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix