finished work on gravity/velocity/friction
Merge branch 'master' of github.com:130610/sd-project