Fix merge

fixed dirt & grass to not be solid....
Cameron you need to fix the player and the orgin for dirt and grass
because I cant tell what to do from the code...and i cant edit code...