refactoring, finding bugs
Merge branch 'master' of ssh://github.com/tubav/fiteagle