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

Conflicts:
	index.html
Merge branch 'master' of https://github.com/albertoblaz/albertoblaz.github.io