updated shockwave and other stuff
Merge branch 'master' of https://github.com/TeamZilla/Destroyer