another another push from gtest3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/haxkil/gtest/Main.java
checkout with master