1
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore