Merge branch 'master' of https://github.com/alexanderKhaustov/gitignore

Conflicts:
	VisualStudio.gitignore
Merge branch 'master' of https://github.com/alexanderKhaustov/gitignore

Conflicts:
	VisualStudio.gitignore