Merge branch 'master' of https://github.com/jcamou/josecamou

Conflicts:
	_site/articles/Resources-for-beginning-web-design/index.html
Merge remote-tracking branch 'origin/master'