Merge pull request #1 from elenasa/master

Catch up
A .gitignore
Dump backup files
Merge pull request #2 from elenasa/master

Catch up to upstream