pixel picking...
Merge branch 'master' into jekyll

Conflicts:
	index.html