fix gitignore
Merge branch 'master' of https://github.com/laertiades/mel_parejo