add .merlin
Merge pull request #53 from rgrinberg/master

add .merlin