Test without fiche
test of modifying posts
Merge branch 'gh-pages' of github.com:davinov/masterpic-montreal-2012 into gh-pages

Conflicts:
	_posts/core-samples/2012-11-01-essilor.md