1
Merge branch 'master' of https://github.com/SeibelStan/vs-blog

Conflicts:
	.idea/misc.xml
	.idea/vs-blog.iml