commiting from leos9385
trying again
Merge remote branch 'origin/master'

Conflicts:
	Git_training1/src/Git_example.java
pushing from leos9385