first blood
why it didn't work?
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge branch 'master' of https://github.com/acbron/acbron.github.io

Conflicts:
	index.html