[Portland 2013] Marni Cohen proposal
Merge pull request #570 from webframp/marni-cohen

[Portland 2013] Marni Cohen proposal