thanks
Merge branch 'gh-pages' of github.com:aphyr/riemann into gh-pages

Conflicts:
	thanks.html