email login mostly working
Merge branch 'master' of https://github.com/web3dev/wordstarz

Conflicts:
	wordstarz.js