trade controllers not done yet.
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix
master controller changes