fff
Merge branch 'master' of github.com:vinjn/vinjn.github.io

Conflicts:
	_posts/2013-04-25-author-preface-opencv2-cookbook.md