Signed-off-by: aaronms <platinum.pirate.platypus@gmail.com>
Junit test case, and minor bug fixed.
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix