New UI
Merge branch 'v2.1' of https://github.com/NShulzhenko/laba3

Conflicts:
	.idea/workspace.xml
	app/views/main.html