login system complete
merge devise