translations
Merge branch 'master' of
https://github.com/carlosvin/carlosvin.github.io.git

Conflicts:
	index.html