first
Merge branch 'master' of https://github.com/AlexGT/blog

Csda
onflicts:
	.gitignore