Ok. But I can't do it now (I have to leave now for a about 3 hours).
So, if you're going to start your changes just now, start from master.
If you're going to work on this later than that then I will have my branch updated and you can start from that. I'll ping you when it's done just to know.
Sorry, but I really have to go now.