Merge branch 'master' into Demetri
CSS Changes
Login styles
made all fields same size
Merge branch 'Demetri'
Clean up whitespace