Merge branch 'master' of https://github.com/decamun/hermione

Conflicts:
	hermione.html