Comedian

n.
  1. An actor or player in comedy.
  2. A writer of comedy.