regenerating annotated source using a newer version of docco
fixing merge conflict
Merge branch 'master' into gh-pages

Conflicts:
	docs/sudoku.html