[merge]
Merge branch 'master' of https://github.com/cunhapassos/GameOfLife

Conflicts:
	target/classes/META-INF/MANIFEST.MF
	target/classes/META-INF/maven/GameOfLife/GameOfLife/pom.properties