minor tweaks to player class references
fixed minor conflict in player class
deleted junk files
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix