Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
One more time, now be gone!!!!

kthxbye
Merge pull request #14 from dotted/master

Delete shit