tots
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from stmfunk/master

I did some neat shit!