random levels working
fixing merge conflicts
Merge pull request #37 from wroy/master

Fixing Winter's merge conflicts