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

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

Conflicts:
	Design/chris_combined_final_draft.dia