Merge pull request #105 from krunalshahmo/master

fixed settings page
fixed a bug in mineCycle
Merge pull request #106 from LandonVance/mcfix

fixed a bug in mineCycle