added login controller
fixed merge
did hella things
server.rb, application.js, partial, and script updates