Merge pull request #71 from CO600GOL/develop

Iteration 7 release
Merge pull request #79 from CO600GOL/develop

Project Conway Version 1.0
Fixed tests that broke due to a faulty merge. All tests are succeeding again and we are still at
100% test coverage.
Version numbers updated in setups.
Merge branch 'master' of github.com:CO600GOL/Game_of_life into develop
Merge branch 'release_v_1_2' into develop