Expand the fitness state machine, and personalize the chatting experience
Merge conflict: compiled scripts
Merge branch 'master' of github.com:atleastimtrying/rubber_duck
Merge branch 'master' into gh-pages