refactory client side
Merge branch 'master' of github.com:andreitognolo/improving-vocabulary