Someone who makes you laugh is a comedian. Someone who makes you think and then laugh is a humorist.