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

Conflicts:
	.gitignore