Merge confilict
conflicts
Added gravity, physics...
Added graVITY