gitignore, dummy file
Merge remote-tracking branch 'remotes/origin/master'
another dummy file to add a folder