Правки
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/deployment.xml
	sites/psycor/config.json
	sites/psycor/controllers/x.js
Правки
Правки
Merge branch 'master' of https://github.com/SeibelStan/vs-blog