Collision and Movement Fix final 5/1/14

IT WORKS!!!