Merge pull request #197 from wgerlach/master

shock upload
Merge branch 'master' of https://github.com/MG-RAST/Shock