Updated bicycle with status
Merge branch 'master' of https://github.com/wholeAss/ETSA01

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleGarage/.i
ndexes/e4/3d/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleGarage/.m
arkers

.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleGarage/.m
arkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleGarage/.s
yncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide
.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4083627954.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	BicycleGarage/src/hyco/User.java
test