Merge branch 'master' of https://github.com/RodrigoDaniel/RodrigoDaniel.github.io

Conflicts:
	README.md
	index.html
	params.json
	stylesheets/pygment_trac.css
	stylesheets/styles.css
Merge branch 'master' of https://github.com/RodrigoDaniel/RodrigoDaniel.github.io

Conflicts:
	README.md
	index.html
	params.json
	stylesheets/pygment_trac.css
	stylesheets/styles.css
ind