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