added missing commits
Merge branch 'master' of github.com:tubav/fiteagle