added content to home/about pages
fix merge conflict on home.html.erb