update git ignore
Merge remote-tracking branch 'upstream/master'
Merge pull request #63 from jerv13/master

update git ignore