adds user controller and views

adding merge per AS request