sqsdejwjk
Merge branch 'master' of https://github.com/grygoryant/course_project

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	README.md
	src/course_project/Server.java
	src/course_project/TestClient.java
	src/course_project/dataBaseConnection.java
	src/course_project/mainClass.java
	src/course_project/projectInterface.java
	src/query/FileTransfer.java
	src/query/Pack.java
	src/query/QueryID.java
	src/queryClient/ClientQuerySender.java
	src/queryClient/IClientQuery.java
	src/queryClient/PhotoReceiver.java
	src/queryClient/RequestCheckLogin.java
	src/queryClient/RequestUserPage.java
	src/queryServer/CheckLogin.java
	src/queryServer/ClientQueryHandler.java
	src/queryServer/GetBattle.java
	src/queryServer/GetBattleList.java
	src/queryServer/GetLikeCount.java
	src/queryServer/GetPhoto.java
	src/queryServer/GetUserPage.java
	src/queryServer/IStrategyQuery.java
	src/queryServer/SQLProcessor.java
Revert 4c3e467..b873ee9

This rolls back to commit 4c3e4672eb95fd30253e3b03c34546c4f0dc09d2.
Revert d766930..e211f39

This rolls back to commit d766930cc62c6da094ec072700dd3b522a7aaf70.
Revert 74bfdc7..2bdbb85

This rolls back to commit 74bfdc75cb3028e7064486e816b0c5d5ab691b78.
Merge branch 'master' of https://github.com/grygoryant/course_project

Conflicts:
	src/course_project/Server.java
	src/course_project/TestClient.java
	src/query/FileTransfer.java
	src/query/Pack.java
	src/query/QueryID.java
	src/queryClient/PhotoReceiver.java
	src/queryClient/RequestCheckLogin.java
	src/queryClient/RequestUserPage.java
	src/queryServer/CheckLogin.java
	src/queryServer/ClientQueryHandler.java
	src/queryServer/GetBattle.java
	src/queryServer/GetBattleList.java
	src/queryServer/GetPhoto.java
	src/queryServer/GetUserPage.java
	src/queryServer/ICommandQuery.java
	src/queryServer/SQLProcessor.java
Revert "Revert d766930..e211f39"

This reverts commit 2bdbb85d54dd575eb894b6a01669bca8f4fc3372.
Merge branch 'master' of https://github.com/grygoryant/course_project