Create conflict
Merge pull request #2 from espacio-de-rack/slashdot

Create conflict
Delete FUCKOFF
Merge pull request #13 from espacio-de-rack/master

conflicting with Chad