For those who want to pick what should and shouldn't be an Olympic sport, here's a list of the current Summer Olympic sports (the 'sports' are then broken down into 'disciplines - e.g. Diving is a discipline of Aquatics);

Aquatics
Archery
Athletics
Badminton
Basketball
Boxing
Canoe / kayak
Cycling
Equestrian
Fencing
Football
Gymnastics
Handball
Hockey
Judo
Modern pentathlon
Rowing
Sailing
Shooting
Table tennis
Taekwondo
Tennis
Triathlon
Volleyball
Weightlifting
Wrestling