shock and normal mines! woooo
added stuffs
Merge pull request #39 from peachesandcorn/master

I'll give you a nickle for a pickle