Fehlerbehebung
Merge branch 'master' of https://github.com/Zakant/GameofLife

Conflicts:
	GameofLife.v12.suo