commit que dara conflictos de merge
Merge branch 'master' of github.com:Nazerbayev/blog_source

Conflicts:
	_includes/footer.html
	assets/css/blog.css
arreglado los estilos y se cambio de textile a markdown