Merge branch 'test_movement'
Merge branch 'master' of https://github.com/totteCh/B17