SetGear changed
Merge branch 'master' of https://github.com/gmarintes/GitTraining

Conflicts:
	src/com/test/IBicycle.java