локальные изменения
local
dapted for windows

Conflicts:
	.idea/workspace.xml
	assets/css/main.css
	index.html
Merge branch 'gh-pages' of github.com:dobriyzhuk/eduservice into gh-pages