Revert 4964dae..67b9197

This rolls back to commit 4964daea879fc80a97c7e2efd34c84a4e0a02519.
Revert "Revert "Revert "Merge branch 'master' of https://github.com/eledezma/firstpersonpuzzle"""

This reverts commit fe4923319703bfb5c2692d8d69f8bf02483d5b98.