Added login functionality
changed to POST
added login functionality
Login
fixed merge conflicts