Revert "Merge branch 'master' of https://github.com/driskull/hackathon"

This reverts commit 8c1f37c6bc2cde44b97d00c8d7c63f9353966d79, reversing
changes made to ebbefa62a75425e745f79164b7b269e90ad2948f.
Revert 8890450..ede60c0

This rolls back to commit 88904509f5991bfda70c35eee99c0733c05c4d35.