changed 2.5
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	hello/src/hello/helloclass.java