Merge branch 'master' of github.com:EntranceJew/evolve