working w/ controller to render a view
views are now rendering
fix merge