forgot what i did lol
Merge branch 'master' of github.com:ludvikbrodl/bicyclegarage

Conflicts:
	src/persistence/Database.java
Merge branch 'master' of github.com:ludvikbrodl/bicyclegarage