Update
Merge branch 'master' of https://github.com/Cloverchan/BicycleGarage

Conflicts:
	src/Database.java