A person who makes you laugh is called a?

A person who makes you laugh could be a clown or a comedian or even a comedienne. Or maybe just a Friend with a great sense of humour. I have some workmates who are really good at making me laugh even though they are not clowns or comedians.