baisc version
Merge branch 'master' of github.com:OttoH/shake_two