Merge branch 'WORDS-21' of https://github.com/StKotok/WordCounter into StKotok-WORDS-21
few minor changes
Merge remote-tracking branch 'kupolua/develop' into develop
added logback
Merge remote-tracking branch 'kupolua/develop' into develop

Conflicts:
	WordCounter.iml
	atlassian-ide-plugin.xml
	build.gradle
	src/main/java/com/qalight/javacourse/DatabaseInputLogic.java
test
Logback testing
WORDS-8 Add functionality to sort results by words or repeat number:
merjed Words-8 with kupol/develop
WORDS-8 Add functionality to sort results by words or repeat number:
bsd cod
Merge remote-tracking branch 'kupolua/develop' into WORDS-8

Conflicts:
	src/main/java/com/qalight/javacourse/Executor.java
	src/main/java/com/qalight/javacourse/WordCounterResultSorter.java
WORDS-8 Add functionality to sort results by words or repeat number:
working...
Merge remote-tracking branch 'kupolua/develop' into develop

Conflicts:
	src/main/java/com/qalight/javacourse/Executor.java
	src/main/java/com/qalight/javacourse/WordCounterResultSorter.java
Merge remote-tracking branch 'kupolua/develop' into develop
WORDS-8 Enum with nested class
Merge branch 'develop' into WORDS-8

Conflicts:
	src/main/java/com/qalight/javacourse/WordCounterResultSorter.java
WORDS-8 Enum with nested class
removed: log4j
added: logback, logback-access
removed: log4j
added: logback, logback-access
removed: log4j
added: logback, logback-access
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/com/qalight/javacourse/servlet/MainServlet.java