Initial Push

Pushing all code into repo
Merge branch 'master' of https://github.com/jcamou/josecamou

Conflicts:
	.sass-cache/89bf0b52b8a6903f038945118d4ece5339add682/style.scssc
	_config.yml
	_site/articles/info/index.html
	_site/articles/test/index.html
	_site/css/style.css
	_site/css/style.scss
	_site/index.php
	_site/post-archive.html
	_site/work-archive.html
	_site/work/conference-posters/index.html
	_site/work/filmhauz/index.html
	_site/work/thinkspace/index.html
	css/style.css
	css/style.scss
	post-archive.html