Fixade buggar
Merge branch 'newgui' of https://github.com/jthure/BicycleGarage into newgui