edit .gitignore
Merge branch 'elf'

* elf:
  edit .gitignore