modified:   .gitignore
Merge branch 'master' into linux

* master:
  modified:   .gitignore

Conflicts:
	.gitignore

	modified:   .gitignore