Refactoring: Reducing layers, using gameLayer instead
Merge remote-tracking branch 'origin/master'