ffs stop conflicting you son of a bitch
you win conflicts
Merge branch 'master' of https://github.com/Jonga/invitie