added comments to Gemfile and static_pages_controller
resolved conflict in static_pages_controller