Comment note
Merge branch 'master' of github.com:influenza/wand-of-rust

Conflicts:
	samples/thumbnail.rs