commit #1
update .gitignore
Merge remote-tracking branch 'github/master'