temp commit
fixed final stuff
Merge branch 'master' of https://github.com/ErikBjare/BikeGarage