res + src
Merge branch 'master' of https://github.com/ninisnanas/TrackFit