foo4
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaFunInGit/src/Foo.java
newgoo