test
Merge branch 'gh-pages' of https://github.com/crmackay/med.hbsgrupos-website into gh-pages

Conflicts:
	_site/2014/02/28/hello-world.html
	_site/2014/03/01/second-post.html
	_site/2014/03/02/symposium-materials.html
	_site/documents/index.html
	_site/goals/index.html
	_site/index.html
	_site/join/index.html
	_site/projects/index.html