aaa
Merge github.com:friparia/vstest

Conflicts:
	.gitignore