atmosphere asset merging
fix merge bugs
framework for disaster generation
Merge pull request #1 from thepostalworker/atmosphereDev

Atmosphere dev