Merge branch 'master' of git@tankernn.eu:gameoflife.git

Conflicts:
	pom.xml

pom.xml

@@ -45,7 +45,7 @@
 									<mainClass>eu.tankernn.gameoflife.GameOfLife</mainClass>
 								</manifest>
 							</archive>
-							<!-- The filename of the assembled distribution file defualt ${project.build.finalName} -->
+							<!-- The filename of the assembled distribution file default ${project.build.finalName} -->
 							<finalName>${project.build.finalName}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>