reset fix because its working?
Merge branch 'master' of github.com:tubav/fiteagle