Merge branch 'master' of C:\Users\Igor\Desktop\7 семестр\On-The-Tour with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
Merge remote-tracking branch 'origin/master'
Добавлена страница гида
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/web/AuthorizationHelper.java
Добавлена страница гида