useless branch stuff
Merge branch 'master' of github.com:gdomingu/learnbystory into savewordtouser
Added logic to add add words to users, created js magic for words appearing
fixed conflicts