AllPlayers/brochure.allplayers.com — pull request #42 by loganbfisher (2013-01-31 03:37:30+00:00)
Title: [#43507091] Fixed merge conflicts

Fixed merge conflicts to try to get the site back in a good state.