commit 02 - Algumas ideias definidas
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	LICENSE.html
	articles/a-simple-article.html
	articles/markdown-example.html
	articles/start-a-blog-with-harp.html
	blog.html