movement now works by clicking on a tile with one of your figures and then moving it
merging changes