enigmatographer

Noun

 * 1) A person who makes or solves puzzles.