update
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	assets/css/pygment_trac.css
	assets/css/stylesheet.css
	assets/images/bg_hr.png
	assets/images/blacktocat.png
	assets/images/icon_download.png
	assets/images/sprite_download.png
	index.html