Fleshes out login template
Merge remote-tracking branch 'upstream/master' into ploveTrials
Merge pull request #7 from plove13x/ploveTrials

Plove trials