rake added to gemfile (required by Travis CI)
Merge branch 'master' of github.com:qw3r/game-of-life