adding before pulling
Merge branch 'master' of https://github.com/dominikschopper/GameOfLife

Conflicts:
	.settings/.jsdtscope
	.settings/org.eclipse.wst.jsdt.ui.superType.container
	.settings/org.eclipse.wst.jsdt.ui.superType.name