Revert "Merge branch 'master' of https://github.com/EstebanCarranza1/GGJ18"

This reverts commit 99d0dc328a8ff3031e6f4a3ebb943d536a0bad25, reversing
changes made to 3064dacba2d10c45352d926855fb811899099d68.
