Merge pull request #11 from reckter/master

merge minigame and master