fix
Merge branch 'master' of https://github.com/Pinusi/mikyelauret

Conflicts:
	IN/index.html