Revert "Revert "Merge branch 'master' of https://github.com/mkoenov/Fit-Fred""

This reverts commit 73e8066654a468b22623c2950e447f01239ec12f.