remvoed file
Added a button for music and changed descriptions

Added a button for music, and changed some strings for descriptions to
more readable strings.
some small changes
some other fixes.
duck
fixed collision bug
Life Meter

Js life meter, stored in var. pixel hearts
fucking fucking fuck
collision detection
Merge branch 'master' of https://github.com/ChemicalWonders/UCR_CodeDay2014
Merge remote-tracking branch 'origin/master' into MobsAndObjects