new
Merge branch 'gh-pages' of https://github.com/joselopezz/joselopez.github.io into gh-pages

Conflicts:
	index.html
	welcome-to-ghost/index.html