Write login and add in users controller
Write methods in users controller
update users controller
pulled master
merge user