npc proto
Merge https://github.com/propra13-orga/gruppe94