Added necromancer and lampmaker
Fixed merge conflicts