rcatlin/Emergency-Response — pull request #146 by Datajax (2013-03-16 16:53:26+00:00)
Title: Mergeattempt1

This is the correct branch.

Master premerged into the Earthquake endings content.
Jennifer's conversation edits.
Final objectives now fail if you haven't completed them on any ending.