First Merge

added users controller and a view for users index