Merge branch 'master' of github.com:devabimael/devabimael.github.com

Conflicts:
	.gitignore
Merge branch 'gh-pages'