gitignore
merlin
Merge pull request #37 from rgrinberg/master

update gitignore + merlin