Changes to marshmallows

World gen for marshmallows is still not working
Merge pull request #11 from iLiminate/master

Changes to marshmallows (Pull Request)