* levi thread
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	src/main/java/main/Main.java
	target/classes/javachallenge/GameThread.class