gitignore zum mergen
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameOfLife/bin/.gitignore