not commit
Merge branch 'master' of https://github.com/wolfier/jirako

Conflicts:
	index.html
hey