Lite fixar
mergeconflict
merge conflict
Merge branch 'newgui' of https://github.com/jthure/BicycleGarage.git into newgui