Merge branch 'gh-pages'

Conflicts:
	images/bg_hr.png
	images/blacktocat.png
	images/icon_download.png
	images/sprite_download.png
	index.html
	params.json