Merge pull request #11 from reckter/master

merge minigame and master
Merge pull request #12 from reckter/miningame

Merge pull request #11 from reckter/master