.gitignore created by brackets-git extension
Merge remote-tracking branch 'origin/master'