added junit tests
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix