Revert "Merge branch 'master' of https://github.com/gdg-nova/game1"

This reverts commit f9dfb4bb7d1fe5342950cdacf13dd642a9f09efc, reversing
changes made to 87f9c561b523756c4ae1c8c8aedcfabf7324075e.
More fixes after merge revert