updated player.js/coffee
merged
merge conflict
Alex's commits
Merge branch 'master' of https://github.com/ChemicalWonders/UCR_CodeDay2014