Added movement
Merge branch 'master' of https://github.com/tommaes/hackathon