changed collision to work with player.lua instead of just the display object. Also finished the player's change color function.
fixed merge