Marvel and Sony end 'Spider-Man' feud

After a public divorce, Spider-Man's parents have patched up their differences.