Adds war hammer and battle axe.

No conflicts this time around.