Merge branch 'master' of C:\Users\Alex\idea\next\nextTry with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
add views for searching, add menu bar
Merge remote-tracking branch 'origin/master'