Update
Merge branch 'master' of https://github.com/daviddliu/loginpage into gh-pages