gtest version
Merge branch 'master' of github.com:watermouth/trial_stl_boost

Conflicts:
	OMakefile