outro test
Merge branch 'master' of https://github.com/firemanxbr/firemanxbr.github.io

Conflicts:
	2014/06/04/new_blog.html
	_sources/2014/06/04/new_blog.txt
	_sources/pages/about.txt
	archive.html
	index.html
	master.html
	pages/about.html
	rss.html
	search.html
	searchindex.js