My collision drama...Works better for player but some code needs to be fixed because it fails from time to time.
Made the jumping somewhat nicer
Merge branch 'master'