Revert "merging"

Reverts atheiman/PickEm#1