collision on shock wave
Merge branch 'masterOfAllThatIsEvil' of https://github.com/Teatree/why.git into masterOfAllThatIsEvil