Revert 79fb8f1..262732c

This rolls back to commit 79fb8f1492804bded5ad0bcfffdedaa58450ef99.
Merge branch 'master' of https://github.com/ChiNonBatteNonJava/ShapeCrash
Revert 8c27fb2..2d5e4c2

This rolls back to commit 8c27fb2dabc2ae47487bc7a783c89cdc3f9897c0.
Merge branch 'master' of https://github.com/ChiNonBatteNonJava/ShapeCrash