fixed login
login js added
js stuff
merge conflict