Aaron's bit for Phase 1 UML
Merge https://github.com/gavinhoward/byu-cs340-sixmix