new
fix

Conflicts:
	README.md
	images/bg_hr.png
	images/blacktocat.png
	images/icon_download.png
	images/sprite_download.png
	index.html
	index.md
	javascripts/main.js
	params.json
	stylesheets/pygment_trac.css
	stylesheets/stylesheet.css