Finished the login pages.
Merge branch 'refs/heads/Annbranch'
Merge remote-tracking branch 'refs/remotes/origin/master'