Commit to be able to merge.
Commit to be able to merge pull request, version 2.
Merge branch 'master' of https://github.com/mvbeek/gol_display
Corrected conflicts.

Conflicts:
	src/gol/GameOfLifeBoard.java
	src/gol/GameOfLifeDisplay.java
	src/gol/GameOfLifeStringDisplay.java
	tests/gol/GameOfLifeGraphicsTest.java