RM .properties
Merge branch 'master' of github.com:NiarK/GameOfLife

Conflicts:
	.gitignore