fix move-discs (it is now a macro)
fix main move function and printing

The printing is now way simpler.
I don't have time to implement a pretty printer.