added Users controller
Finish layout and routes
merge