Fixed carpool and added shirt ninja.
Fixed Pokemon Test and removed Asshole
Merge pull request #3 from rchowe/master

Removed Asshole and added Carpool and Shirt Ninja