hejhå
Merge branch 'master' of https://github.com/wholeAss/ETSA01

Conflicts:
	BicycleGarage/src/hyco/BicycleGarageManagerGUI.java
Merge branch 'master' of https://github.com/wholeAss/ETSA01