Updated stuff for the disc and player objects
Merge branch 'master' of ssh://github.com/cbrant/final_project