Merge https://github.com/PawelK2012/trainingbuddy