Add .gitignore
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from jmolivas/master

Add .gitignore