got rid of kinetics
Merge branch 'master' of https://github.com/ninjacuzzi/ggtc