Sikeres változtatás! :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/Naplo.doc
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Sikeres változtatás! :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/brainiac/Game.java
	src/main/java/com/brainiac/controller/Skeleton.java
	src/main/java/com/brainiac/model/GameElements.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/brainiac/Game.java
	src/main/java/com/brainiac/controller/Skeleton.java
	src/main/java/com/brainiac/model/GameElements.java