Adds warhammer and battlaxe.

No conflicts this time around.