gtest
Merge branch 'master' of github.com:sunmo/gtest

Conflicts:
	.gitignore