Preparing to merge
Merge branch 'master' of github.com:ErikBjare/BikeGarage

Conflicts:
	src/db/BikeOwner.java