Alex really final really
LOG
Whatever
Merge remote-tracking branch 'origin/master'

Conflicts:
	logs/log.out
	src/main/java/javachallenge/Connection.java
	src/main/java/main/Main.java