added final changes to our uml concept design
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix

Conflicts:
	Design/chris_combined_final_draft.dia
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix