Bugfixes: Confusion Berries, Pinch + Contrary
Merge pull request #301 from Fuzzysqurl/master

Bugfixes: Confuse Berries, Pinch + Contrary