Tragedy: Serious themes (death, love, betrayal); protagonist's downfall/death. Examples: Oedipus Rex, Antigone.
Comedy: Lighter themes (love, marriage, satire); happy resolution (often marriage). Examples: Aristophanes' Lysistrata, The Clouds.
Both originated in Dionysian festivals; tragedy earlier (6th c. BCE), comedy later (5th c. BCE).