The Tokyo Olympics will include surfing, skateboarding, climbing, karate, baseball, and softball