Dagens arbe
no comment...
Fixed merge conflicts