Revert "Revert "Merge branch 'master' of https://github.com/eledezma/firstpersonpuzzle""

This reverts commit 9654901a43c72f5251e3eee4c1c8513ca8bd34f6.