Revert "Merge branch 'master' of https://github.com/HacktheUniverse/interstellar-telephone"

This reverts commit 9efb8f9ecf3bc30468e0a3b9e72f0245476b7864, reversing
changes made to 0f9f4bd52f96844480cbd5cf77e75c6b56bbc1da.
Merge branch 'master' of https://github.com/HacktheUniverse/interstellar-telephone
fixed, I hope