Added about me page
Merge branch 'master' of https://github.com/jcamou/josecamou

Conflicts:
	_site/about/index.html
	_site/articles/index.html
	_site/articles/info/index.html
	_site/articles/test/index.html
	_site/index.php
	_site/post-archive.html
	_site/post-archive.html.orig
	_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
	about.markdown
	post-archive.html.orig