HAHA SMILEY

I'm in your code
Merge pull request #1 from RachelMcDermott/master

Take it