fscottfoti/foss4g-urbansim2-paper — pull request #1 by waddell (2014-03-22 21:56:19+00:00)
Title: first test of merging edits

Edited a bit in intro, just to test the merging process in Github.