Merge pull request #19 from d3athrow/Bleeding-Edge

Bleeding edge
Added peptobismol.
Merge pull request #1242 from Heredth/promotionsforeveryone

Anti-Dan