final

Signed-off-by: Jonas Thuresson <thuresson.j@gmail.com>
Merge branch 'newgui' of https://github.com/jthure/BicycleGarage.git into newgui