Signed-off-by: horus <horus@horus.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/esprit/git/MyJavaClass.java