Just kidding
Merge pull request #26 from dominickmiller/disaster

Just kidding