ponies, rainbow, friend-o-magic
Merge pull request #1 from kasthack/master

ponies, rainbow, friend-o-magic