Commit from Workspace B
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spring/src/com/example/SpringExample.java