new commit
Merge commit 'new/master'

Conflicts:
	.gitignore