repair trampoline
Merge branch 'master' of github.com:TanyaGaleyev/Panda-project