more
completed deletion.
Merge branch 'master' of https://github.com/ChemicalWonders/UCR_CodeDay2014 into features/player