Update .gitignore
Delete .blankfile
Merge remote-tracking branch 'upstream/master'