added login
Merge branch 'master' into jason
added login
Merge pull request #2 from gdomingu/jason

Jason
stuff
stuff two
Merge branch 'master' of github.com:gdomingu/learnbystory
fixed strange errors
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