added application.html.erb layout back in and created an 'about' page to show erb and haml served up by the same controller (no surprises there)