buggy merge with jump code
fixed issues with obstacles, completed integration to add Player class