current stuff
login page styling done
sub
Merge branch 'master' into dan_server_side