local
Merge branch 'gh-pages' of https://github.com/dobriyzhuk/eduservice into gh-pages

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/gh-pages' into gh-pages