re-added pages_controller_spec
added users controller
finshed with layout for now
fixed merge conflict