Edit markup and CSS
Merge branch 'master' of https://github.com/pedrosmmoreira/coding-blog

Conflicts:
	.gitignore