Merge branch 'master' of https://github.com/ricardomspires/homepage into gh-pages

Conflicts:
	index.html