test
Merge remote-tracking branch 'origin/master'
Set web structure for frontend
Merge remote-tracking branch 'origin/master'
Bug fix. Delete same name path.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/bionic/socialNetwork/rest/UserController.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\Matvey\IdeaProjects\SocialNetwork with conflicts.
added selectByUse
added selectByUserId