Merge pull request #2 from leshields/master

blocked!
Merge pull request #3 from leshields/master

blocked
I won\!
Merge pull request #3 from crookedneighbor/master

Boo