alert message on login
merging js-only
merge prep
Merge pull request #1 from LadyNorm/master

Spenser is being crazy