"fixed" collision
Merge branch 'master'
Made gravity nicer to use
Merge branch 'master'