Merge pull request #870 from bridgetkromhout/master

Adding proposal for Minneapolis.