merge

src/amulet.cpp

src/armor.cpp

src/food.cpp

src/include/amulet.h

src/include/armor.h

src/include/food.h

src/include/item.h

src/include/level.h

src/include/mob.h

src/include/monster.h

src/include/playerchar.h

src/include/potion.h

src/include/ring.h

src/include/scroll.h

src/include/tunnel.h

src/include/wand.h

src/include/weapon.h

src/item.cpp

src/level.cpp

src/mob.cpp