merged: static_pages branch & added home.html.erb