updating classes to deal with movement
Merge branch 'master' of https://github.com/rbellido/Project