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

Conflicts:
	.sass-cache/89bf0b52b8a6903f038945118d4ece5339add682/style.scssc
	_config.yml
	_site/about/index.html
	_site/articles/Resources-for-beginning-web-design/index.html
	_site/articles/bands-stuck-in-the-90s/index.html
	_site/articles/index.html
	_site/css/style.css
	_site/css/style.scss
	_site/index.php
	_site/work/conference-posters/index.html
	_site/work/filmhauz/index.html
	_site/work/illustration-collection/index.html
	_site/work/index.html
	_site/work/portfolio/index.html
	_site/work/thinkspace/index.html
	css/style.css
	css/style.scss
Merge branch 'master' of https://github.com/jcamou/josecamou

Conflicts:
	_site/articles/Resources-for-beginning-web-design/index.html