Added welcome.html, added darker logo
Fixed merge conflicts in login