a new change
Merge branch 'master' of https://github.com/sergvera/javaProjects

Conflicts:
	gitSamples/addedFromSourceTree.txt