less jarring <strong> color
Conflicts:
	stylesheets/screen.scss
runnable code examples can't have shared annotations
Conflicts:
	documentation/1.1/tour/basics.md
fix source code collection
Conflicts:
	js/common.js