commit aldrin
Merge branch 'WBGitTraining_abro' of https://github.com/gmarintes/WorkbenchGitTraining1 into WBGitTraining_abro

Conflicts:
	src/com/test/Bicycle.java