Combining work with Aritei

Aritei and I have synchronized our work on my GH fork, since we can't collaborate directly through the campaigns (only the campaign owner can edit the template).