Controller

Too few changes but I think that is ok, this tuesday we should test the
whole game to fix the possible errors
Controller 2

I change a little things, I have doubts about the undo method, we may
discuss it on tuesday