from vi
Merge branch 'gtest' of https://github.com/psbindu/gtest2 into gtest

Conflicts:
	sp.txt