added login
login sessions good - masa
merge conflic resolved